绍兴站联合任务下发，缺陷详情修改

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

@@ -620,8 +620,18 @@ public class ResultAnalysisController extends BaseController {
         logger.info("LIST_V2_EX listV2Ex param: {}", patrolTaskStatus);
         ResultAnalysis resultAnalysis = new ResultAnalysis();
         resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId());
-        resultAnalysis.setResultType("0"); // 0缺陷
-        List<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
+        // 查出全部数据
+        List<PatrolData> allList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
+
+        Map<String, String> imageNormalMap = allList.parallelStream()
+                .filter(patrolData -> StringUtils.isNotEmpty(patrolData.getImageNormalUrlPath()))
+                .collect(Collectors.toMap(
+                        patrolData -> patrolData.getObjectId() + "_" + patrolData.getAlgType(),
+                        PatrolData::getImageNormalUrlPath,
+                        (existing, replacement) -> existing
+                ));
+        // 筛出缺陷数据
+        List<PatrolData> filterList = allList.parallelStream().filter(patrolData -> "0".equals(patrolData.getWarnStatus())).collect(Collectors.toList());
         List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
         filterList.forEach((item) -> {
             item.setAlgName((algInfos.stream().anyMatch((alg) -> {
@@ -666,7 +676,8 @@ public class ResultAnalysisController extends BaseController {
                     patrolData.setImg(data.getImg());
                 }
             }
-            patrolData.setImageNormalUrlPath(value.stream().map(item -> item.getImageNormalUrlPath() != null ? item.getImageNormalUrlPath() : "").distinct().findFirst().orElse(""));
+            String imageNormalPath = imageNormalMap.getOrDefault(key.objectId + "_" + key.algType, "");
+            patrolData.setImageNormalUrlPath(imageNormalPath);
             patrolData.setAlgName(value.stream().map(item -> item.getAlgName() != null ? item.getAlgName() : "").distinct().findFirst().orElse(""));
             patrolData.setAreaName(value.stream().map(item -> item.getAreaName() != null ? item.getAreaName() : "").distinct().findFirst().orElse(""));
             patrolData.setBrightDesc(value.stream().map(item -> item.getBrightDesc() != null ? item.getBrightDesc() : "").distinct().findFirst().orElse(""));

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

@@ -5,10 +5,7 @@ import com.inspect.taskinfo.domain.PatrolTaskInfo;
 import com.inspect.taskinfo.mapper.PatrolTaskInfoMapper;
 import com.inspect.taskinfo.service.IPatrolTaskInfoService;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,16 +48,23 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService {
 
     public Map<String, List> selectPatrolTaskInfoListByMajorId(String taskId) {
         Map<String, List> map = new HashMap<>();
-        List<String> list1 = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorId(taskId);//query point base on device|point format
+        List<String> list1 = new ArrayList<>();
         List<String> listFull = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdFull(taskId);
-        if(list1.size() > 0 && list1.get(0).equals(listFull.get(0))) {
-            List<String> list2 = this.patrolTaskInfoMapper.selectPatrolTaskInfoListByMajorIdEither(taskId);//query point base on device_point format
-            map.put("list" , list2);
-            map.put("listFull", listFull);
-        } else {
-            map.put("list" , list1);
-            map.put("listFull", listFull);
+        if (listFull.size() > 0) {
+            for (int i = 0; i < listFull.size(); i++) {
+                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);
+                }
+                list1.add(value);
+            }
         }
+
+        map.put("list" , list1);
+        map.put("listFull", listFull);
         return map;
     }