初筛列表和归档修改

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java

@@ -516,17 +516,14 @@ public class ResultAnalysisController extends BaseController {
 
     @GetMapping({"/list_v2"})
     public TableDataInfo listV2(PatrolTaskStatus patrolTaskStatus) {
-        logger.info(Color.GREEN + "[RES ANALYZE] listV2 param: {}" + Color.END, patrolTaskStatus);
+        logger.info("[RES ANALYZE] listV2 param: {}", patrolTaskStatus);
         ResultAnalysis resultAnalysis = new ResultAnalysis();
         resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId());
-        resultAnalysis.setResult("0");
+        resultAnalysis.setResult("0");//初筛结果
+        startPage();
         List<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
         List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
-        startPage();
-        resultAnalysis.setResult("1");
-        resultAnalysis.setResultType("1");
-        List<PatrolData> dataList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
-        dataList.forEach((item) -> {
+        filterList.forEach((item) -> {
             item.setAlgName((algInfos.stream().anyMatch((alg) -> {
                 return alg.getAlgSubtypeCode().equals(item.getAlgType());
             }) ? algInfos.stream().filter((alg) -> {
@@ -545,10 +542,10 @@ public class ResultAnalysisController extends BaseController {
                 item.setImg(item.getImgAnalyse());
                 item.setImgAnalyse("");
             }
-
         });
-        Collections.sort(dataList);
-        return getDataTable(dataList);
+//        logger.info("[RES ANALYZE] filterList: {}", JSONObject.toJSONString(filterList, true));
+        Collections.sort(filterList);
+        return getDataTable(filterList);
     }
 
     @GetMapping({"summary/points"})

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

@@ -437,7 +437,9 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
 
             String pointStatus = patrolResultRef.getPointStatus();
             log.info("[RESULT] pointStatus: {}", pointStatus);
-            if (pointStatus.equals("0")) {
+            if(pointStatus == null) {
+                continue;
+            } else if (pointStatus.equals("0")) {
                 reportData.setPointStatus("异常");
                 reportData.setCode(failNum);
                 ++failNum;

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

@@ -199,21 +199,20 @@ public class PatrolTaskResultMainController extends BaseController {
         startTime = PrintUtil.useTime("INQUIRY ANALYZE DATA", startTime);
         logger.info("[ARCHIVE] Id: {}, collectNum: {}, analyseNum: {}, modifyNum:{}", mainId, collectNum, analyseNum, modifyNum.get());
         if (modifyNum.get() + analyseNum != collectNum) {
-            final String failMsg = "[ARCHIVE] FAIL! Analyse number equals not gather number!";
-            logger.error(failMsg);
-            return AjaxResult.error(failMsg);
-        } else {
-            Long reportId = patrolResultService.saveReport(resultMain, lineIds, lineId, resultList);
-            PrintUtil.useTime("ARCHIVE END", startTime);
-            (new Thread(() -> {
-                long beginTime = (new Date()).getTime();
-                logger.info("[EXPORT REPORTS] StartTime: {}, reportId: {}", DateUtil.now(), reportId);
-                exportExcelWordAndZip(String.valueOf(reportId));
-                PrintUtil.useTime("EXPORT REPORTS END", beginTime);
-            })).start();
-            return toAjax(1);
+            final String failMsg = "-------------------------------------[ARCHIVE] FAIL! Analyse number equals not gather number!";
+            logger.info(failMsg);
         }
 
+        Long reportId = patrolResultService.saveReport(resultMain, lineIds, lineId, resultList);
+        PrintUtil.useTime("ARCHIVE END", startTime);
+        (new Thread(() -> {
+            long beginTime = (new Date()).getTime();
+            logger.info("[EXPORT REPORTS] StartTime: {}, reportId: {}", DateUtil.now(), reportId);
+            exportExcelWordAndZip(String.valueOf(reportId));
+            PrintUtil.useTime("EXPORT REPORTS END", beginTime);
+        })).start();
+        return toAjax(1);
+
     }
 
     public String ToStationIn(String areaId) {

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

@@ -141,14 +141,14 @@ public class PatrolTaskStatusController extends BaseController {
 
     @GetMapping({"/list"})
     public TableDataInfo list(PatrolTaskStatus patrolTaskStatus) {
-        log.info("[TASK STATUS] patrolTaskStatus: {}", patrolTaskStatus.toString());
+//        log.info("[TASK STATUS] patrolTaskStatus: {}", patrolTaskStatus.toString());
         this.startPage();
         List<PatrolTaskStatus> list = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus);
-        log.info("[TASK STATUS] list cnt: {}", list.size());
+//        log.info("[TASK STATUS] list cnt: {}", list.size());
         String taskPatrolIds = "'" + list.stream().map((item) -> {
             return item.getTaskPatrolledId();
         }).collect(Collectors.joining("','")) + "'";
-        log.info("[TASK STATUS] taskPatrolIds: {}", taskPatrolIds);
+//        log.info("[TASK STATUS] taskPatrolIds: {}", taskPatrolIds);
         List<PatrolTaskResultMain> resultMains = patrolTaskResultMainService.selectMainFileStatus(taskPatrolIds);
         String taskCodeIds = "'" + list.stream().map((item) -> {
             return item.getTaskCode();