feat:1.跟踪，忽略，确认逻辑优化 2.配置初筛算法，不走大模型

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

@@ -7,6 +7,7 @@ import com.inspect.analysis.domain.*;
 import com.inspect.analysis.service.IResultAnalysisService;
 import com.inspect.base.core.constant.Color;
 import com.inspect.base.core.domain.Response;
+import com.inspect.base.core.enums.PointStatusEnum;
 import com.inspect.base.core.utils.StringUtils;
 import com.inspect.base.core.utils.poi.ExcelUtil;
 import com.inspect.base.core.web.controller.BaseController;
@@ -397,30 +398,43 @@ public class ResultAnalysisController extends BaseController {
         if (patrolTaskInfo.getLineIds() == null) {
             patrolTaskInfo.setLineIds(patrolTaskInfo.getLineId() + "");
         }
-
+        // 初筛 忽略，不用改大模型状态  跟踪确认，初筛、大模型都改成跟踪确认
+        // 初筛、大模型，改成跟踪确认忽略，初筛、大模型都改成跟踪确认忽略
+        // 大模型，跟踪确认忽略，大模型都改成跟踪确认忽略
         logger.info("[ANALYSIS] lineIds: {}", patrolTaskInfo.getLineIds());
         String[] strs = patrolTaskInfo.getLineIds().split(StringUtils.COMMA);
+
         for (String str : strs) {
             ResultAnalysis resultAnalysis = new ResultAnalysis();
             resultAnalysis.setLineId(Long.valueOf(str));
             List<ResultAnalysis> resultAnalysisList = resultAnalysisService.selectResultAnalysisList(resultAnalysis);
             if (!resultAnalysisList.isEmpty()) {
                 ResultAnalysis analysis = resultAnalysisList.get(0);
+                // 初筛结果，跟踪确认，大模型的结果状态也要改为跟踪确认  初筛 meter，其余算法不覆盖
+                if (strs.length == 1
+                        && (PointStatusEnum.CONFIRMED.getCode().equals(patrolTaskInfo.getStatus())
+                        || PointStatusEnum.TRACKING.getCode().equals(patrolTaskInfo.getStatus()))
+                        && "1".equals(analysis.getFilter()) && !"meter".equals(analysis.getAlgType())) {
+                    // 初筛大模型都改  都覆盖
+                    analysis.setLineId(null);
+                    analysis.setDescription("缺陷");
+                }
                 logger.info("[ANALYSIS] lineId: {}", analysis.getLineId());
-                // 告警确认状态 3-已撤销（忽略） 4-跟踪（告警） 5-确认
+                // 告警确认状态 3-已撤销（忽略） 4-跟踪（告警） 5-确认 6-缺陷
                 analysis.setPointStatus(patrolTaskInfo.getStatus());
                 analysis.setSuggestion(patrolTaskInfo.getSuggestion());
-                if ("5".equals(patrolTaskInfo.getStatus())) {
+                // meter初筛结果不变，大模型结果不变
+                if (PointStatusEnum.CONFIRMED.getCode().equals(patrolTaskInfo.getStatus())) {
                     // 确认
                     analysis.setResultType("0");//缺陷
-                } else if ("3".equals(patrolTaskInfo.getStatus())) {
+                } else if (PointStatusEnum.REVOKED.getCode().equals(patrolTaskInfo.getStatus())) {
                     // 忽略
                     analysis.setResultType("1");//结果正常
-                } else if ("4".equals(patrolTaskInfo.getStatus())) {
+                    analysis.setDescription("忽略");
+                } else if (PointStatusEnum.TRACKING.getCode().equals(patrolTaskInfo.getStatus())) {
                     // 跟踪
                     analysis.setResultType("0");//缺陷
                 }
-
 //                resultAnalysisService.updateResultAnalysis(analysis);
                 resultAnalysisService.updateResultAnalysisByCondition(analysis);
             }
@@ -698,7 +712,7 @@ public class ResultAnalysisController extends BaseController {
             patrolData.setDeviceName(value.stream().map(item -> item.getDeviceName() != null ? item.getDeviceName() : "").distinct().findFirst().orElse(""));
             patrolData.setDeviceSource(value.stream().map(item -> item.getDeviceSource() != null ? item.getDeviceSource() : "").distinct().findFirst().orElse(""));
             patrolData.setImgType(value.stream().map(item -> item.getImgType() != null ? item.getImgType() : "").distinct().findFirst().orElse(""));
-            patrolData.setLineId(value.stream().map(item -> item.getLineId() != null ? item.getLineId() : "").distinct().findFirst().orElse(""));
+            patrolData.setLineId(value.stream().map(PatrolData::getLineId).distinct().collect(Collectors.joining(",")));
             patrolData.setPatrolTime(value.stream().map(item -> item.getPatrolTime() != null ? item.getPatrolTime() : "").distinct().findFirst().orElse(""));
             patrolData.setPointId(value.stream().map(item -> item.getPointId() != null ? item.getPointId() : "").distinct().findFirst().orElse(""));
             patrolData.setPointName(value.stream().map(item -> item.getPointName() != null ? item.getPointName() : "").distinct().findFirst().orElse(""));

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

@@ -178,6 +178,10 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
                     bDefect,
                     analyseResPoint.getType(),
                     algType);
+            if (algType.equals("filter")) {
+                log.info("**************配置初筛算法，不走大模型*****************");
+                bDefect = false;
+            }
             if (bDefect || AlgConstants.BIG_MODEL_ALG_LIST.contains(algType)) {
                 /*
                  * 先检查结果有缺无缺陷，如果有缺陷不用判断算法直接调用大模型；*

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

@@ -473,13 +473,14 @@ public class PatrolTaskController extends BaseController {
             // 异常置顶
             newList.sort(Comparator.comparingInt(obj -> {
                 switch (obj.getPointStatus()) {
-                    case "0": return 1; // 异常
+                    case "6": return 1; // 缺陷
                     case "5": return 2; // 确认
                     case "4": return 3; // 跟踪（告警）
-                    case "1": return 4; // 正常
-                    case "2": return 5; // 待人工确认
-                    case "3": return 6; // 已撤销（忽略）
-                    default: return 7;
+                    case "0": return 4; // 异常
+                    case "1": return 5; // 正常
+                    case "2": return 6; // 待人工确认
+                    case "3": return 7; // 已撤销（忽略）
+                    default: return 8;
                 }
             }));
         }
@@ -3406,6 +3407,11 @@ public class PatrolTaskController extends BaseController {
                     map1.put("label", MessageUtils.get("确认"));
                 }
 
+                if (item.getPointStatus().equals(PointStatusEnum.DEFECT.getCode())) {
+                    map1.put("value", "6");
+                    map1.put("label", MessageUtils.get("缺陷"));
+                }
+
                 listPointStatus.add(item.getPointStatus());
                 mapList.add(map1);
             }

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

@@ -411,29 +411,15 @@
         update result_analysis
         <trim prefix="SET" suffixOverrides=",">
             <if test="resultType != null">result_type = #{resultType},</if>
-            <if test="businessId != null">business_id = #{businessId},</if>
-            <if test="resultContent != null">result_content = #{resultContent},</if>
-            <if test="resStatus != null">res_status = #{resStatus},</if>
             <if test="pointStatus != null">point_status = #{pointStatus},</if>
-            <if test="objectId != null">objectId = #{objectId},</if>
             <if test="suggestion != null">suggestion = #{suggestion},</if>
             <if test="description != null">description = #{description},</if>
-            <if test="requestId != null">request_id = #{requestId},</if>
-            <if test="taskPatrolId != null">task_patrol_id  = #{taskPatrolId},</if>
-            <if test="algType != null">alg_type = #{algType},</if>
-            <if test="resValue != null">res_value = #{resValue},</if>
-            <if test="resCode != null">res_code = #{resCode},</if>
-            <if test="resConf != null">res_conf = #{resConf},</if>
-            <if test="resDesc != null">res_desc = #{resDesc},</if>
-            <if test="result != null">result = #{result},</if>
-            <if test="resImgUrl != null">res_img_url = #{resImgUrl},</if>
-            <if test="imageNormalUrlPath != null">image_normal_url_path = #{imageNormalUrlPath},</if>
-            <if test="resPos != null">res_pos = #{resPos},</if>
-            <if test="filter != null">filter = #{filter},</if>
-            <if test="originalValue != null">original_value = #{originalValue},</if>
         </trim>
             <where>
                 objectId = #{objectId} and alg_type = #{algType} and task_patrol_id  = #{taskPatrolId}
+                <if test="lineId != null  and lineId != ''">
+                    and line_id = #{lineId}
+                </if>
             </where>
     </update>