/*1. 云深处机器狗刀闸分合大模型结果处理；2.

初筛大模型结果一起查询接口增加：list_v2_ex*/

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

@@ -611,6 +611,40 @@ public class ResultAnalysisController extends BaseController {
 //        }
     }
 
+    //初筛大模型一起查询
+    @GetMapping({"/list_v2_ex"})
+    public TableDataInfo listV2Ex(PatrolTaskStatus patrolTaskStatus) {
+        logger.info("LIST_V2_EX listV2Ex param: {}", patrolTaskStatus);
+        ResultAnalysis resultAnalysis = new ResultAnalysis();
+        resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId());
+        resultAnalysis.setResultType("0"); // 0缺陷
+        startPage();
+        List<PatrolData> filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis);
+        List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
+        filterList.forEach((item) -> {
+            item.setAlgName((algInfos.stream().anyMatch((alg) -> {
+                return alg.getAlgSubtypeCode().equals(item.getAlgType());
+            }) ? algInfos.stream().filter((alg) -> {
+                return alg.getAlgSubtypeCode().equals(item.getAlgType());
+            }).findFirst().get().getAlgSubtypeName() : ""));
+            if ("1".equals(item.getFilter())) {
+                item.setImg(item.getImageNormalUrlPath());
+            }
+
+            AlgValue algValue = new AlgValue();
+            if(item.getResValue() != null) {
+                String str = algValue.formatValue(item.getResValue());
+                if ("meter".equals(item.getAlgType())) {
+                    if (str.equals("-1")) {
+                        item.setResValue("空值");
+                    }
+                }
+            }
+        });
+        Collections.sort(filterList);
+        return getDataTable(filterList);
+    }
+
     @GetMapping({"/list_v3"})
     public TableDataInfo listV3(PatrolTaskStatus patrolTaskStatus) {
         ResultAnalysis resultAnalysis = new ResultAnalysis();

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

@@ -187,10 +187,11 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
             analyseRequest = (AnalyseRequest) redisService.redisTemplate.opsForValue().getAndDelete(bigModelRequestRedisKey);
             if (analyseRequest != null) {
                 analyseResult.reloadReq(analyseRequest);
-                log.info("ALGORITHM_BIG_MODEL_RESULT taskPatrolId: {}, requestId: {}, DATA IN REDIS: {}",
+                log.info("ALGORITHM_BIG_MODEL_RESULT taskPatrolId: {}, requestId: {}, DATA IN REDIS: {}, reloadResult: {}",
                         analyseRequest.getTaskPatrolId(),
                         requestId,
-                        analyseRequest);
+                        analyseRequest,
+                        analyseResult);
 
                 // 发给光明大模型处理
                 redisService.redisTemplate.opsForList().rightPush(

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java

@@ -47,14 +47,14 @@ public class ResultAnalysisUtils {
     }
 
     public void parseAlg(String algType, AlgValue algValue, String value, String defaultDesc, ResultAnalysis resultAnalysis) {
-        log.warn("parseAlg algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc);
+        log.info("parseAlg algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc);
 
         if ("1".equals(resultAnalysis.getFilter()) && algType != null &&
                 (algType.equals("infrared") ||
-                algType.equals("infra_1800") ||
-                algType.equals("infra_yu3") ||
-                algType.equals("infra_camera") ||
-                algType.equals("infra_camera_reverse"))) {
+                        algType.equals("infra_1800") ||
+                        algType.equals("infra_yu3") ||
+                        algType.equals("infra_camera") ||
+                        algType.equals("infra_camera_reverse"))) {
             if (messageUtils.get("分析失败").equals(defaultDesc)) {
                 // 绍兴红外分析失败改成正常
                 resultAnalysis.setResultType("1");
@@ -76,7 +76,7 @@ public class ResultAnalysisUtils {
             algType = "";
         }
 
-        if(StringUtils.isNull(algType)) {
+        if (StringUtils.isNull(algType)) {
             log.warn("parseAlg algType is null!");
             return;
         }
@@ -144,18 +144,18 @@ public class ResultAnalysisUtils {
                 algType.equals("infra_camera_reverse") ||
                 algType.equals("xb")) {
             String device = "";
-            if(algType.equals("infrared")) {
+            if (algType.equals("infrared")) {
                 device = messageUtils.get("红外");
-            } else if(algType.equals("infra_1800")) {
+            } else if (algType.equals("infra_1800")) {
                 log.info("红外1800===============");
                 device = messageUtils.get("红外1800");
-            } else if(algType.equals("infra_yu3")) {
+            } else if (algType.equals("infra_yu3")) {
                 device = messageUtils.get("无人机红外");
-            } else if(algType.equals("infra_camera")) {
+            } else if (algType.equals("infra_camera")) {
                 device = messageUtils.get("摄像头红外");
-            } else if(algType.equals("infra_camera_reverse")) {
+            } else if (algType.equals("infra_camera_reverse")) {
                 device = messageUtils.get("摄像头红外灰度反算");
-            } else if(algType.equals("xb")) {
+            } else if (algType.equals("xb")) {
                 device = messageUtils.get("形变");
             }
 
@@ -174,18 +174,26 @@ public class ResultAnalysisUtils {
                 defaultDesc = "-";
             }
         } else if (algType.equals("isolator")) {
-            if (value.equals("3")) {
+            log.info("ALG_TYPE isolator value: {}", value);
+            if (value.equals("1")) {
+                defaultDesc = "分";
+            } else if (value.equals("2")) {
+                defaultDesc = "合";
+            } else if (value.equals("3")) {
                 resultAnalysis.setPointStatus("1");
                 resultAnalysis.setResultType("1");
                 resultAnalysis.setResStatus("0");
+                defaultDesc = "分位异常";
             } else if (value.equals("4")) {
                 resultAnalysis.setPointStatus("1");
                 resultAnalysis.setResultType("1");
                 resultAnalysis.setResStatus("0");
+                defaultDesc = "合位异常";
             } else {
                 resultAnalysis.setPointStatus("0");
                 resultAnalysis.setResultType("2");
                 resultAnalysis.setResStatus("0");
+                defaultDesc = "未检测到刀闸";
             }
         } else {
             log.info("parseAlg algType: {}", algType);