灵州站优化点位过多情况下的任务修改，接口超时问题

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -1938,6 +1938,7 @@ public class PatrolResultController extends BaseController {
             ArrayList items;
             Iterator iterator;
             if (contype.equals("2")) {
+                // 同步任务文件
                 maintAreaList = patrolTaskService.selectPatrolTaskList(new PatrolTask());
                 if (null != maintAreaList && !maintAreaList.isEmpty()) {
                     items = new ArrayList<>();
@@ -2009,6 +2010,7 @@ public class PatrolResultController extends BaseController {
                     modelXml = pulseGet.getXml(pd);
                 }
             } else if (contype.equals("3")) {
+                // 同步维护区域文件
                 maintAreaList = maintainRegionService.selectMaintainRegionList(new MaintainRegion());
                 if (null != maintAreaList && !maintAreaList.isEmpty()) {
                     items = new ArrayList<>();

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

@@ -593,7 +593,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
         String AiNum = statisticsAnalyseNumLingZhou(lineIds);
 //        String[] nums = new String[]{AiNum, filterNum};
         String[] nums = new String[]{AiNum};
-        startTime = PrintUtil.useTime("STATISTICS ANALYZE DATA", startTime);
+        startTime = PrintUtil.useTime("STATISTICS ANALYZE DATA", startTime); // 26s
         if (resultList.isEmpty()) {
             throw new ServiceException("LACK INSPECT RESULT: " + mainId);
         } else {
@@ -681,9 +681,9 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
                             report.setFilter(String.valueOf(i));
                             report.setStationType(stationType);
                             inspectionReportMapper.insertInspectionReport(report);
-                            PrintUtil.useTime("NEW TASK REPORT", startTime);
+                            PrintUtil.useTime("NEW TASK REPORT", startTime); // 12s
                             batchInsertReportData(String.valueOf(report.getLineId()), lineIds, String.valueOf(i), patrolResultRefs);
-                            PrintUtil.useTime("BATCH INSERT DETAIL", startTime);
+                            PrintUtil.useTime("BATCH INSERT DETAIL", startTime); // 13s
                             log.info("[ARCHIVE] reportId: {}", report.getLineId());
                             Long lineId = report.getLineId();
                             reportIds.add(lineId);

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

@@ -669,12 +669,13 @@ public class PatrolTaskController extends BaseController {
                     Long majorId = patrolTask.getTaskId();
                     PatrolTaskInfo patrolTaskInfo = new PatrolTaskInfo();
                     patrolTaskInfo.setTaskMajorId(majorId + "");
-                    List<PatrolTaskInfo> infolist = patrolTaskInfoService.selectPatrolTaskInfoList(patrolTaskInfo);
-                    if (!infolist.isEmpty()) {
-                        for (PatrolTaskInfo arr : infolist) {
-                            patrolTaskInfoService.deletePatrolTaskInfoByLineId(arr.getLineId());
-                        }
-                    }
+                    patrolTaskInfoService.deletePatrolTaskInfoByMajorId(majorId);
+//                    List<PatrolTaskInfo> infolist = patrolTaskInfoService.selectPatrolTaskInfoList(patrolTaskInfo);
+//                    if (!infolist.isEmpty()) {
+//                        for (PatrolTaskInfo arr : infolist) {
+//                            patrolTaskInfoService.deletePatrolTaskInfoByLineId(arr.getLineId());
+//                        }
+//                    }
 //                    patrolTask.setTaskId((long) taskId);
                     if (patrolTask.getIsUp() == null || StringUtils.isEmpty(patrolTask.getIsUp())) {
 //                        PatrolTask patrolTaskTemp = patrolTaskService.selectPatrolTaskByTaskId((long) taskId);
@@ -683,8 +684,28 @@ public class PatrolTaskController extends BaseController {
                         patrolTask.setTaskCode(patrolTask.getTaskId() + "");
                     }
                     List<PrevPoint> prevPoints = patrolTask.getPrevPoints();
+                    List<String> eqpBookIds = prevPoints.parallelStream().map(PrevPoint::getEqpBookId).collect(Collectors.toList());
+                    List<String> parentIds = prevPoints.parallelStream().map(PrevPoint::getParentId)
+                            .filter(Objects::nonNull)
+                            .filter((item) -> item.contains(StringUtils.DASH))
+                            .map((item) -> item.split(StringUtils.DASH)[1])
+                            .collect(Collectors.toList());
+                    List<Map<String, String>> list = new ArrayList<>();
+                    Map<String, Map<String, String>> eqpBooksMap = new HashMap<>();
+                    if (eqpBookIds.size() > 0) {
+                         list = patrolTaskInfoService.selectVideoPosByPointIdByEqpbookIds(eqpBookIds);
+                         eqpBooksMap = list.stream().collect(Collectors.toMap(e -> String.valueOf(e.get("eqp_book_id")), e -> e, (e1, e2) -> e2));
+                    }
+                    List<PatrolTaskInfo> patrolTaskInfoListDb = new ArrayList<>();
+                    Map<String, PatrolTaskInfo> patrolTaskInfoMap = new HashMap<>();
+                    if (parentIds.size() > 0) {
+                        patrolTaskInfoListDb = patrolTaskInfoService.selectTaskInfoByBaseIds(parentIds);
+                        patrolTaskInfoMap = patrolTaskInfoListDb.stream().collect(Collectors.toMap(PatrolTaskInfo::getDeviceId, e -> e, (e1, e2) -> e2));
+                    }
+                    List<PatrolTaskInfo> patrolTaskInfos = new ArrayList<>();
                     for (PrevPoint prevPoint : prevPoints) {
-                        Map<String, String> videoPos = patrolTaskInfoService.selectVideoPosByPointId(prevPoint.getEqpBookId());
+//                        Map<String, String> videoPos = patrolTaskInfoService.selectVideoPosByPointId(prevPoint.getEqpBookId());
+                        Map<String, String> videoPos = eqpBooksMap.get(prevPoint.getEqpBookId());
                         String type = videoPos.get("type");
                         String patrolDeviceCode = videoPos.get("patrol_device_code");
                         String typeEx;
@@ -698,7 +719,8 @@ public class PatrolTaskController extends BaseController {
 
                         if (prevPoint.getParentId().contains(StringUtils.DASH)) {
                             String[] str = prevPoint.getParentId().split(StringUtils.DASH);
-                            PatrolTaskInfo patrolInfo = patrolTaskInfoService.selectTaskInfoByBaseId(str[1]);
+//                            PatrolTaskInfo patrolInfo = patrolTaskInfoService.selectTaskInfoByBaseId(str[1]);
+                            PatrolTaskInfo patrolInfo = patrolTaskInfoMap.get(str[1]);
                             patrolInfo.setTaskMajorId(String.valueOf(majorId));
                             patrolInfo.setPresetCode(prevPoint.getPresetCode());
                             patrolInfo.setDeviceId(str[1]);
@@ -707,9 +729,14 @@ public class PatrolTaskController extends BaseController {
                             patrolInfo.setParentId(prevPoint.getParentId());
                             patrolInfo.setEbookId(prevPoint.getEqpBookId());
                             patrolInfo.setEbookName(prevPoint.getLabel());
-                            patrolTaskInfoService.insertPatrolTaskInfo(patrolInfo);
+                            patrolInfo.setCreateTime(new Date());
+                            patrolTaskInfos.add(patrolInfo);
+//                            patrolTaskInfoService.insertPatrolTaskInfo(patrolInfo);
                         }
                     }
+                    if (patrolTaskInfos.size() > 0) {
+                        patrolTaskInfoService.batchInsertPatrolTaskInfo(patrolTaskInfos);
+                    }
                 }
                 issueTask(patrolTask);
                 // 修改任务，删除原有的任务执行策略，根据新的策略重新生成

inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java

@@ -14,10 +14,14 @@ public interface PatrolTaskInfoMapper {
 
     PatrolTaskInfo selectTaskInfoByBaseId(String baseId);
 
+    List<PatrolTaskInfo> selectTaskInfoByBaseIds(@Param("baseIds") List<String> baseIds);
+
     String selectAlgSubtypeIdsByPatrolPointId(String patrolPointId);
 
     Map<String, String> selectVideoPosByPointId(String pointId);
 
+    List<Map<String, String>> selectVideoPosByPointIdByEqpbookIds(@Param("list") List<String> pointIds);
+
     Map<String, String> selectPoseInfo(@Param("devId") String devId, @Param("eqbookId") String eqBookId);
 
     List<PatrolTaskInfo> selectPatrolTaskInfoList(PatrolTaskInfo patrolTaskInfo);
@@ -34,6 +38,8 @@ public interface PatrolTaskInfoMapper {
 
     int insertPatrolTaskInfo(PatrolTaskInfo patrolTaskInfo);
 
+    int batchInsertPatrolTaskInfo(@Param("patrolTaskInfos") List<PatrolTaskInfo> patrolTaskInfos);
+
     int updatePatrolTaskInfo(PatrolTaskInfo patrolTaskInfo);
 
     int deletePatrolTaskInfoByLineId(Long lineIds);
@@ -44,4 +50,5 @@ public interface PatrolTaskInfoMapper {
 
     List<Map<String, Object>> selectPatrolTaskInfoCount(@Param("list") List<String> taskInfoIds);
 
+    int deletePatrolTaskInfoByMajorId(Long taskMajorId);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java

@@ -10,11 +10,14 @@ public interface IPatrolTaskInfoService {
     PatrolTaskInfo selectPatrolTaskInfoByLineId(Long lineId);
 
     PatrolTaskInfo selectTaskInfoByBaseId(String baseId);
+    List<PatrolTaskInfo> selectTaskInfoByBaseIds(List<String> baseIds);
 
     String selectAlgSubtypeIdsByPatrolPointId(String patrolPointId);
 
     Map<String, String> selectVideoPosByPointId(String pointId);
 
+    List<Map<String, String>> selectVideoPosByPointIdByEqpbookIds(List<String> pointIds);
+
     Map<String, String> selectPoseInfo(String key, String key2);
 
     List<PatrolTaskInfo> selectPatrolTaskInfoList(PatrolTaskInfo info);
@@ -27,6 +30,8 @@ public interface IPatrolTaskInfoService {
 
     int insertPatrolTaskInfo(PatrolTaskInfo patrolTaskInfo);
 
+    int batchInsertPatrolTaskInfo(List<PatrolTaskInfo> patrolTaskInfo);
+
     int updatePatrolTaskInfo(PatrolTaskInfo patrolTaskInfo);
 
     int deletePatrolTaskInfoByLineIds(Long[] lineIds);
@@ -36,4 +41,6 @@ public interface IPatrolTaskInfoService {
     int deletePatrolTaskInfoByMajorIds(Long[] majorIds);
 
     List<Map<String, Object>> selectPatrolTaskInfoCount(List<String> taskInfoIds);
+
+    int deletePatrolTaskInfoByMajorId(Long majorId);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java

@@ -26,6 +26,10 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService {
         return this.patrolTaskInfoMapper.selectTaskInfoByBaseId(lineId);
     }
 
+    public List<PatrolTaskInfo> selectTaskInfoByBaseIds(List<String> baseIds) {
+        return this.patrolTaskInfoMapper.selectTaskInfoByBaseIds(baseIds);
+    }
+
     public String selectAlgSubtypeIdsByPatrolPointId(String patrolPointId) {
         return this.patrolTaskInfoMapper.selectAlgSubtypeIdsByPatrolPointId(patrolPointId);
     }
@@ -34,6 +38,10 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService {
         return this.patrolTaskInfoMapper.selectVideoPosByPointId(lineId);
     }
 
+    public List<Map<String, String>> selectVideoPosByPointIdByEqpbookIds(List<String> pointIds) {
+        return this.patrolTaskInfoMapper.selectVideoPosByPointIdByEqpbookIds(pointIds);
+    }
+
     public Map<String, String> selectPoseInfo(String devId, String eqBookId) {
         return this.patrolTaskInfoMapper.selectPoseInfo(devId, eqBookId);
     }
@@ -76,6 +84,10 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService {
         return this.patrolTaskInfoMapper.insertPatrolTaskInfo(patrolTaskInfo);
     }
 
+    public int batchInsertPatrolTaskInfo(List<PatrolTaskInfo> patrolTaskInfos) {
+        return this.patrolTaskInfoMapper.batchInsertPatrolTaskInfo(patrolTaskInfos);
+    }
+
     public int updatePatrolTaskInfo(PatrolTaskInfo patrolTaskInfo) {
         return this.patrolTaskInfoMapper.updatePatrolTaskInfo(patrolTaskInfo);
     }
@@ -95,4 +107,8 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService {
     public List<Map<String, Object>> selectPatrolTaskInfoCount(List<String> taskInfoIds) {
         return this.patrolTaskInfoMapper.selectPatrolTaskInfoCount(taskInfoIds);
     }
+
+    public int deletePatrolTaskInfoByMajorId(Long taskMajorId) {
+        return this.patrolTaskInfoMapper.deletePatrolTaskInfoByMajorId(taskMajorId);
+    }
 }

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

@@ -147,6 +147,18 @@
         where a.patrol_point_id = #{lineId}
     </select>
 
+    <select id="selectTaskInfoByBaseIds" resultMap="PatrolTaskInfoResult">
+        select a.patrol_point_name as device_name,
+               a.device_id         as component_id,
+               a.main_device_id    as main_device_id,
+               a.patrol_point_id   as device_id
+        from basedata_patrolpoint a
+        where a.patrol_point_id in
+        <foreach item="pointId" collection="baseIds" open="(" separator="," close=")">
+            #{pointId}
+        </foreach>
+    </select>
+
     <select id="selectAlgSubtypeIdsByPatrolPointId" parameterType="String" resultType="String">
         select a.alg_subtype_ids as algSubtypeIds
         from basedata_patrolpoint a
@@ -174,6 +186,14 @@
         </foreach>
         group by taskMajorId
     </select>
+    <select id="selectVideoPosByPointIdByEqpbookIds" resultType="java.util.Map">
+        select a.*
+        from basedata_eqpbook a
+        where a.eqp_book_id in
+        <foreach item="pointId" collection="list" open="(" separator="," close=")">
+            #{pointId}
+        </foreach>
+    </select>
 
 
     <insert id="insertPatrolTaskInfo" parameterType="PatrolTaskInfo" useGeneratedKeys="true" keyProperty="lineId">
@@ -217,6 +237,23 @@
             <if test="createTime != null">#{createTime},</if>
         </trim>
     </insert>
+    <insert id="batchInsertPatrolTaskInfo">
+        INSERT INTO patrol_task_info (
+        task_major_id, device_id, device_name, component_id, component_name,
+        bay_id, bay_name, main_device_id, main_device_name, phy_asset_id,
+        dev_type, preset_code, parent_id, ebook_id, ebook_name, dev_no, create_time
+        ) VALUES
+        <foreach collection="patrolTaskInfos" item="item" separator=",">
+            (
+            #{item.taskMajorId}, #{item.deviceId}, #{item.deviceName},
+            #{item.componentId}, #{item.componentName}, #{item.bayId},
+            #{item.bayName}, #{item.mainDeviceId}, #{item.mainDeviceName},
+            #{item.phyAssetId}, #{item.devType}, #{item.presetCode},
+            #{item.parentId}, #{item.ebookId}, #{item.ebookName},
+            #{item.devNo}, #{item.createTime}
+            )
+        </foreach>
+    </insert>
 
     <update id="updatePatrolTaskInfo" parameterType="PatrolTaskInfo">
         update patrol_task_info
@@ -260,4 +297,7 @@
             #{majorId}
         </foreach>
     </delete>
+    <delete id="deletePatrolTaskInfoByMajorId">
+        delete from patrol_task_info where task_major_id = #{taskMajorId}
+    </delete>
 </mapper>

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

@@ -144,7 +144,7 @@
     <select id="selectResultAnalysisListByMainIdsNew" resultMap="ResultAnalysisResult">
         select b.business_id, b.point_status, b.res_status, b.alg_type,b.result_type,b.objectId,b.task_patrol_id
         from patrol_result a
-        left join result_analysis b on a.line_id = b.business_id
+        left join result_analysis b on a.line_id = b.business_id and a.device_id = b.objectId and a.task_patrolled_id = b.task_patrol_id
         where a.main_id in
         <foreach item="item" index="index" collection="lineIds" open="(" separator="," close=")">
             #{item}

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/service/impl/BasedataPatrolPointServiceImpl.java

@@ -198,6 +198,7 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
     private String getModelXml(BasedataPatrolPoint basedataPatrolpoint) {
         List<BasedataPatrolPoint> list = this.basedataPatrolpointMapper.selectBasedataPatrolPointList(basedataPatrolpoint);
         if (null != list && !list.isEmpty()) {
+            logger.info("省侧点位同步[META] list size: {}", list.size());
             DevicePointModel devicePointModel = new DevicePointModel();
             List<DevicePointModelItem> items = new ArrayList<>();
             String station_id = null;
@@ -337,13 +338,12 @@ public class BasedataPatrolPointServiceImpl implements IBasedataPatrolPointServi
                 modelItem.setPoint_type("");
                 modelItem.setLabel_attri("");
 
-                if(hasChinese(main_device_id) || hasChinese(component_id) || hasChinese(device_id)) {
-                    continue;
-                }
-
-                if(device_type == null || device_type.equals("10000")){
-                    continue;
-                }
+//                if(hasChinese(main_device_id) || hasChinese(component_id) || hasChinese(device_id)) {
+//                    continue;
+//                }
+//                if(device_type == null || device_type.equals("10000")){
+//                    continue;
+//                }
 
                 items.add(modelItem);
             }