优化钱塘江巡视任务进度页面

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java

@@ -64,6 +64,8 @@ public interface ResultAnalysisMapper {
 
     ResultAnalysis selectTaskAbnormalData(ResultAnalysis resultAnalysis);
 
+    List<Map<String, Object>> selectTaskAbnormalDataBatch(@Param("list") List<String> taskPatrolledIds);
+
     List<AlgPatrolPoint> selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel);
 
     List<PatrolData> selectResultAnalysisListForAlarm(AnalyseSummaryAlarmModel alarmModel);
@@ -73,4 +75,6 @@ public interface ResultAnalysisMapper {
     List<ResultAnalysis> selectResultAnalysisListByMainIds(@Param("lineIds") List<Long> lineIds);
 
     List<ResultAnalysis> selectResultAnalysisListByMainIdsNew(@Param("lineIds") List<Long> lineIds, @Param("filter") String filter);
+
+    List<ResultAnalysis> selectResultAnalysisListBatch(@Param("list") List<String> taskPatrolIds, @Param("resultType") String resultType);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java

@@ -48,8 +48,11 @@ public interface IResultAnalysisService {
 
     ResultAnalysis selectTaskAbnormalData(ResultAnalysis resultAnalysis);
 
+    Map<String, ResultAnalysis> selectTaskAbnormalDataBatch(List<String> taskPatrolledIds);
+
     List<AlgPatrolPoint> selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel);
 
     List<PatrolData> selectResultAnalysisListForAlarm(AnalyseSummaryAlarmModel alarmModel);
 
+    List<ResultAnalysis> selectResultAnalysisListBatch(List<String> taskPatrolIds, String resultType);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java

@@ -10,6 +10,7 @@ import com.inspect.partrolresult.domain.PatrolResult;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.inspect.task.domain.PatrolData;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -105,6 +106,32 @@ public class ResultAnalysisServiceImpl implements IResultAnalysisService {
         return this.resultAnalysisMapper.selectTaskAbnormalData(resultAnalysis);
     }
 
+    public Map<String, ResultAnalysis> selectTaskAbnormalDataBatch(List<String> taskPatrolledIds) {
+        if (taskPatrolledIds == null || taskPatrolledIds.isEmpty()) {
+            return new HashMap<>();
+        }
+
+        List<Map<String, Object>> resultList = resultAnalysisMapper.selectTaskAbnormalDataBatch(taskPatrolledIds);
+
+        return resultList.stream().collect(Collectors.toMap(
+                item -> (String) item.get("taskPatrolledId"),
+                item -> {
+                    ResultAnalysis analysis = new ResultAnalysis();
+                    analysis.setTaskPatrolledId((String) item.get("taskPatrolledId"));
+                    analysis.setCsQxNum(((Number) item.get("csQxNum")).intValue());
+                    analysis.setAiQxNum(((Number) item.get("aiQxNum")).intValue());
+                    analysis.setCsYcNum(((Number) item.get("csYcNum")).intValue());
+                    analysis.setAiYcNum(((Number) item.get("aiYcNum")).intValue());
+                    return analysis;
+                }
+        ));
+    }
+
+    @Override
+    public List<ResultAnalysis> selectResultAnalysisListBatch(List<String> taskPatrolIds, String resultType) {
+        return resultAnalysisMapper.selectResultAnalysisListBatch(taskPatrolIds, resultType);
+    }
+
     public List<AlgPatrolPoint> selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel) {
         return this.resultAnalysisMapper.selectResultAnalyseForAlarm(alarmModel);
     }

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

@@ -1461,10 +1461,17 @@ public class PatrolResultController extends BaseController {
                         if (patrolPointId != null) {
                             patrolResult.setDeviceId(patrolPointId.toString());
                         }
+//                        InputStream is = null;
+//                        String filePath = patrolResult.getFilePath();
+//                        if (filePath != null && !filePath.isEmpty()) {
+//                            String[] filePathArr = filePath.split(StringUtils.COMMA);
+//                            for (String s : filePathArr) {
+//                                is = doGetRequestForInputStream(intranetFtpAddress + s);
+//                            }
+//                        }
+//                        InputStream is = doGetRequestForInputStream(intranetFtpAddress + patrolResult.getFilePath());
 
-                        InputStream is = doGetRequestForInputStream(intranetFtpAddress + patrolResult.getFilePath());
-
-                        logger.info("feedback from robot image size: {}", (is != null));
+//                        logger.info("feedback from robot image size: {}", (is != null));
 //                        if (is != null) {
 //                            try {
 //                                is = ImageUtil.overlaying(is, patrolResult.getRectangle(), patrolResult.getValue());

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

@@ -44,10 +44,12 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
+@RefreshScope
 public class PatrolResultServiceImpl implements IPatrolResultService {
     private static final Logger log = LoggerFactory.getLogger(PatrolResultServiceImpl.class);
 
@@ -1201,7 +1203,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
             return String.format(messageUtils.get("缺陷点位：%d个。"), count);
         } else {
             int totalNum = analyses.size();
-            log.info("lineIds:{},statisticsAnalyseNum analyses:{}", lineIds, analyses);
+            log.info("lineIds:{},statisticsAnalyseNum analyses size:{}", lineIds, totalNum);
             for (ResultAnalysis analyse : analyses) {
                 String resultType = analyse.getResultType();
                 if ("0".equals(resultType)) {
@@ -1428,7 +1430,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
             }
 
             String resultType = patrolResultRef.getResultType();
-            log.info("[RESULT] resultType: {}, patrolResultRef: {}", resultType, patrolResultRef);
+//            log.info("[RESULT] resultType: {}, patrolResultRef: {}", resultType, patrolResultRef);
             if(resultType == null) {
                 continue;
             } else if (resultType.equals("0")) {

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

@@ -3327,12 +3327,14 @@ public class PatrolTaskResultMainController extends BaseController {
         InspectionReportData inspectionReportQxData = new InspectionReportData();
         inspectionReportQxData.setPointStatus(MessageUtils.get("缺陷"));
         list.add(inspectionReportQxData);
-//        InspectionReportData inspectionReportZcData = new InspectionReportData();
-//        inspectionReportZcData.setPointStatus(MessageUtils.get("正常"));
-//        list.add(inspectionReportZcData);
-//        InspectionReportData inspectionReportYcData = new InspectionReportData();
-//        inspectionReportYcData.setPointStatus(MessageUtils.get("异常"));
-//        list.add(inspectionReportYcData);
+        if ("1".equals(exportReportFlag)) {
+            InspectionReportData inspectionReportZcData = new InspectionReportData();
+            inspectionReportZcData.setPointStatus(MessageUtils.get("正常"));
+            list.add(inspectionReportZcData);
+            InspectionReportData inspectionReportYcData = new InspectionReportData();
+            inspectionReportYcData.setPointStatus(MessageUtils.get("异常"));
+            list.add(inspectionReportYcData);
+        }
         int total = 0;
         label186:
         for (Iterator var74 = list.iterator(); var74.hasNext(); total += 2) {

inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java

@@ -28,7 +28,7 @@ public interface PatrolTaskResultMainMapper {
 
     int deletePatrolTaskResultMainByLineIds(Long[] lineIds);
 
-    List<PatrolTaskResultMain> selectMainFileStatus(String patrolIds);
+    List<PatrolTaskResultMain> selectMainFileStatus(@Param("list") List<String> patrolIds);
 
     List<Long> selectLineIds(Long lineId);
 

inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java

@@ -25,7 +25,7 @@ public interface IPatrolTaskResultMainService {
 
     int deletePatrolTaskResultMainByLineId(Long lineId);
 
-    List<PatrolTaskResultMain> selectMainFileStatus(String patrolIds);
+    List<PatrolTaskResultMain> selectMainFileStatus(List<String> patrolIds);
 
     List<Long> selectLineIds(Long lineId);
 

inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java

@@ -60,7 +60,7 @@ public class PatrolTaskResultMainServiceImpl implements IPatrolTaskResultMainSer
         return this.patrolTaskResultMainMapper.deletePatrolTaskResultMainByLineId(lineId);
     }
 
-    public List<PatrolTaskResultMain> selectMainFileStatus(String patrolIds) {
+    public List<PatrolTaskResultMain> selectMainFileStatus(List<String> patrolIds) {
         return this.patrolTaskResultMainMapper.selectMainFileStatus(patrolIds);
     }
 

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

@@ -42,6 +42,6 @@ public interface PatrolTaskInfoMapper {
 
     int deletePatrolTaskInfoByMajorIds(Long[] majorIds);
 
-    List<Map<String, Object>> selectPatrolTaskInfoCount(String taskInfoIds);
+    List<Map<String, Object>> selectPatrolTaskInfoCount(@Param("list") List<String> taskInfoIds);
 
 }

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

@@ -35,5 +35,5 @@ public interface IPatrolTaskInfoService {
 
     int deletePatrolTaskInfoByMajorIds(Long[] majorIds);
 
-    List<Map<String, Object>> selectPatrolTaskInfoCount(String taskInfoIds);
+    List<Map<String, Object>> selectPatrolTaskInfoCount(List<String> taskInfoIds);
 }

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

@@ -55,9 +55,8 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService {
                 String value = listFull.get(i);
                 if (listFull.get(i).contains("|") && listFull.get(i).indexOf("|") < listFull.get(i).length()-1) {
                     value = value.substring(value.indexOf("|") + 1);
-                }
-                if (listFull.get(i).contains("_") && listFull.get(i).indexOf("_") < listFull.get(i).length()-1) {
-                    value = value.substring(0, value.indexOf("_") + 1);
+                } else if (listFull.get(i).contains("_") && listFull.get(i).indexOf("_") < listFull.get(i).length()-1) {
+                    value = value.substring(value.indexOf("_") + 1);
                 }
                 list1.add(value);
             }
@@ -93,7 +92,7 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService {
         return this.patrolTaskInfoMapper.deletePatrolTaskInfoByMajorIds(majorIds);
     }
 
-    public List<Map<String, Object>> selectPatrolTaskInfoCount(String taskInfoIds) {
+    public List<Map<String, Object>> selectPatrolTaskInfoCount(List<String> taskInfoIds) {
         return this.patrolTaskInfoMapper.selectPatrolTaskInfoCount(taskInfoIds);
     }
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java

@@ -139,26 +139,28 @@ public class PatrolTaskStatusController extends BaseController {
 
     @GetMapping({"/list"})
     public TableDataInfo list(PatrolTaskStatus patrolTaskStatus) {
-        log.info("PATROL_TASK_STATUS LIST patrolTaskStatus: {}", patrolTaskStatus.toString());
         this.startPage();
         List<PatrolTaskStatus> list = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus);
-        log.info("PATROL_TASK_STATUS LIST cnt: {}", list.size());
-        String taskPatrolIds = "'" + list.stream().map((item) -> {
-            return item.getTaskPatrolledId();
-        }).collect(Collectors.joining("','")) + "'";
-        log.info("PATROL_TASK_STATUS LIST taskPatrolIds: {}", taskPatrolIds);
+        if (list == null || list.size() == 0) {
+            return this.getDataTable(list);
+        }
+        List<String> taskPatrolIds = list.stream().map(PatrolTaskStatus::getTaskPatrolledId).collect(Collectors.toList());
         List<PatrolTaskResultMain> resultMains = patrolTaskResultMainService.selectMainFileStatus(taskPatrolIds);
-        String taskCodeIds = "'" + list.stream().map((item) -> {
-            return item.getTaskCode();
-        }).collect(Collectors.joining("','")) + "'";
-        log.info("PATROL_TASK_STATUS LIST resultMains size: {}", resultMains.size());
+        List<String> taskCodeIds = list.stream().map(PatrolTaskStatus::getTaskCode).collect(Collectors.toList());
         List<Map<String, Object>> pointList = patrolTaskInfoService.selectPatrolTaskInfoCount(taskCodeIds);
         Map<String, String> pointMap = pointList.stream().collect(Collectors.toMap((item) -> {
             return (String) item.get("taskMajorId");
         }, (item) -> {
             return String.valueOf(item.get("num"));
         }));
-        log.info("PATROL_TASK_STATUS LIST pointMap size: {}", pointMap.size());
+
+        Map<String, ResultAnalysis> abnormalDataBatchMap = resultAnalysisService.selectTaskAbnormalDataBatch(taskPatrolIds);
+        List<ResultAnalysis> allQxAnalysisList = resultAnalysisService.selectResultAnalysisListBatch(taskPatrolIds, "0");
+        Map<String, Map<GroupKey, List<ResultAnalysis>>> groupedAnalysisMap = allQxAnalysisList.stream()
+                .collect(Collectors.groupingBy(
+                        ResultAnalysis::getTaskPatrolId,
+                        Collectors.groupingBy(data -> new GroupKey(data.getObjectId(), data.getAlgType()))
+                ));
         list.forEach((item) -> {
             item.setPatrolStatus("1");
             item.setPointCount(pointMap.get(item.getTaskCode()));
@@ -174,31 +176,19 @@ public class PatrolTaskStatusController extends BaseController {
                     item.setFileStatus("0");
                 }
             }
-
-            ResultAnalysis resultAnalysis = new ResultAnalysis();
-            resultAnalysis.setTaskPatrolledId(item.getTaskPatrolledId());
-            ResultAnalysis analysisRes = resultAnalysisService.selectTaskAbnormalData(resultAnalysis);
-            item.setCsQxNum(analysisRes == null ? 0 : analysisRes.getCsQxNum());
-            item.setAiQxNum(analysisRes == null ? 0 : analysisRes.getAiQxNum());
-            item.setCsYcNum(analysisRes == null ? 0 : analysisRes.getCsYcNum());
-            item.setAiYcNum(analysisRes == null ? 0 : analysisRes.getAiYcNum());
-            log.info("PATROL_TASK_STATUS LIST analysisRes: {}", analysisRes == null ? -1 : analysisRes);
-            resultAnalysis.setResultType("0");
-            resultAnalysis.setTaskPatrolId(item.getTaskPatrolledId());
-            List<ResultAnalysis> filterList = resultAnalysisService.selectResultAnalysisList(resultAnalysis);
-            log.info("PATROL_TASK_STATUS LIST filterList size: {}", filterList.size());
-            Map<GroupKey, List<ResultAnalysis>> groupedFilterList = filterList.stream().collect(Collectors.groupingBy(
-                    data -> new GroupKey(data.getObjectId(), data.getAlgType())
-            ));
-            item.setQxNum(groupedFilterList.size());
-            if(StringUtils.isEmpty(item.getTaskEstimatedTime())) {
+            // 异常数据统计
+            ResultAnalysis resultAnalysis = abnormalDataBatchMap.getOrDefault(item.getTaskPatrolledId(), new ResultAnalysis());
+            item.setCsQxNum(resultAnalysis.getCsQxNum());
+            item.setAiQxNum(resultAnalysis.getAiQxNum());
+            item.setCsYcNum(resultAnalysis.getCsYcNum());
+            item.setAiYcNum(resultAnalysis.getAiYcNum());
+            Map<GroupKey, List<ResultAnalysis>> groupKeyListMap = groupedAnalysisMap.get(item.getTaskPatrolledId());
+            item.setQxNum(groupKeyListMap == null ? 0 : groupKeyListMap.size());
+            if (StringUtils.isEmpty(item.getTaskEstimatedTime())) {
                 item.setTaskEstimatedTime("0");
             }
         });
-
-        log.info("PATROL_TASK_STATUS LIST END");
         return this.getDataTable(list);
-
     }
 
     private static class GroupKey {

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

@@ -166,9 +166,12 @@
           and b.eqp_book_id = #{eqbookId}
     </select>
 
-    <select id="selectPatrolTaskInfoCount" parameterType="String" resultType="Map">
+    <select id="selectPatrolTaskInfoCount" resultType="Map">
         select task_major_id as taskMajorId,count(1) as num from  patrol_task_info
-        where task_major_id in (${ids})
+        where task_major_id in
+        <foreach item="item" collection="list" open="(" separator="," close=")">
+            #{item}
+        </foreach>
         group by taskMajorId
     </select>
 

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

@@ -127,7 +127,7 @@
         where line_id = #{lineId}
     </select>
 
-    <select id="selectMainFileStatus" parameterType="String" resultMap="PatrolTaskResultMainResult">
+    <select id="selectMainFileStatus" resultMap="PatrolTaskResultMainResult">
         SELECT
             line_id,
             task_patrolled_id,
@@ -135,7 +135,10 @@
         FROM
             patrol_task_result_main
         WHERE
-            task_patrolled_id in (${ids})
+            task_patrolled_id in
+        <foreach collection="list" item="taskPatrolledId" open="(" separator="," close=")">
+            #{taskPatrolledId}
+        </foreach>
     </select>
 
     <select id="selectLineIds" resultType="java.lang.Long">

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

@@ -613,6 +613,23 @@
             ) aiYcNum
     </select>
 
+
+    <select id="selectTaskAbnormalDataBatch" parameterType="java.util.List" resultType="map">
+        SELECT
+        task_patrol_id as taskPatrolledId,
+        SUM(CASE WHEN result_type = '0' AND filter = '1' THEN 1 ELSE 0 END) as csQxNum,
+        SUM(CASE WHEN result_type = '0' AND filter = '0' THEN 1 ELSE 0 END) as aiQxNum,
+        SUM(CASE WHEN result_type = '2' AND filter = '1' THEN 1 ELSE 0 END) as csYcNum,
+        SUM(CASE WHEN result_type = '2' AND filter = '0' THEN 1 ELSE 0 END) as aiYcNum
+        FROM result_analysis
+        WHERE task_patrol_id IN
+        <foreach collection="list" item="id" open="(" close=")" separator=",">
+            #{id}
+        </foreach>
+        AND result_type IN ('0', '2')
+        GROUP BY task_patrol_id
+    </select>
+
     <select id="selectResultAnalyseForAlarm" parameterType="com.inspect.analysis.domain.AnalyseSummaryAlarmModel"
             resultMap="AlgPatrolPointResult">
         SELECT
@@ -676,4 +693,13 @@
         ORDER BY b.line_id desc
     </select>
 
+    <select id="selectResultAnalysisListBatch" resultMap="ResultAnalysisResult">
+        <include refid="selectResultAnalysisVo"/>
+        WHERE task_patrol_id IN
+            <foreach collection="list" item="taskPatrolId" open="(" close=")" separator=",">
+                #{taskPatrolId}
+                </foreach>
+        AND result_type = #{resultType}
+    </select>
+
 </mapper>