Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java

@@ -26,6 +26,8 @@ public interface PatrolResultMapper {
 
     List<PatrolResult> selectPatrolResultList(PatrolResult patrolResult);
 
+    PatrolResult selectPatrolResultByDeviceName(String deviceName);
+
     List<PatrolResult> selectPatrolResultListOrderBy(PatrolResult patrolResult);
 
     List<PatrolData> selectPatrolDataResultByTaskCode(PatrolResult patrolResult);

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java

@@ -19,6 +19,8 @@ public interface IPatrolResultService {
 
     List<PatrolResult> selectPatrolResultList(PatrolResult patrolResult);
 
+    PatrolResult selectPatrolResultByDeviceName(String deviceName);
+
     ResultAnalysis selectTaskAbnormalData(ResultAnalysis resultAnalysis);
 
     List<PatrolResult> selectPatrolResultListOrderBy(PatrolResult patrolResult);

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java

@@ -105,6 +105,10 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
         return patrolResultMapper.selectPatrolResultList(patrolResult);
     }
 
+    public PatrolResult selectPatrolResultByDeviceName(String deviceName) {
+        return patrolResultMapper.selectPatrolResultByDeviceName(deviceName);
+    }
+
     public ResultAnalysis selectTaskAbnormalData(ResultAnalysis patrolResult) {
         return resultAnalysisMapper.selectTaskAbnormalData(patrolResult);
     }

inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/controller/PatrolTaskResultMainController.java

@@ -751,7 +751,7 @@ public class PatrolTaskResultMainController extends BaseController {
                     images.add(originalImgSrc);
                     String pointName = reportData.getPointName();
                     pointName = (pointName != null) ? pointName : "unnamed";
-
+                    PatrolResult patrolResult = patrolResultService.selectPatrolResultByDeviceName(pointName);
                     // 提取文件扩展名
                     String extension = "";
                     int dotIndex = originalImgSrc.lastIndexOf('.');
@@ -760,7 +760,8 @@ public class PatrolTaskResultMainController extends BaseController {
                     }
 
                     // 生成唯一文件名（包含 lineId 防止重复）
-                    String uniqueFileName = String.format("%s_%s_%d%s",
+                    String uniqueFileName = String.format("%s_%s_%s_%d%s",
+                            (patrolResult != null ? patrolResult.getDeviceId() : ""),
                             pointName,
                             reportData.getLineId(),
                             imgIndex,

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -2995,6 +2995,8 @@ public class PatrolTaskController extends BaseController {
             item.setAlgName(algInfos.stream().filter(
                     (alg) -> alg.getAlgSubtypeCode().equals(item.getAlgType())).findFirst().get().getAlgSubtypeName()
             );
+            item.setFilterDesc(item.getDesc());
+            item.setDesc("");
 
             if (!listPointName.contains(item.getPointName())) {
                 listPointName.add(item.getPointName());

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml

@@ -96,6 +96,17 @@
             ORDER BY line_id desc
         </where>
     </select>
+
+    <select id="selectPatrolResultByDeviceName" parameterType="String" resultMap="PatrolResultResult">
+        select
+            line_id,
+            device_name,
+            device_id
+        from patrol_result
+        where
+            device_name = #{deviceName} order by line_id desc limit 1
+    </select>
+
     <select id="selectPatrolResultListOrderBy" parameterType="PatrolResult" resultMap="PatrolResultResult">
         <include refid="selectPatrolResultVo"/>
         <where>