fix: 避雷器表计增加value2字段，辅助读数

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResPoint.java

@@ -12,6 +12,8 @@ public class AnalyseResPoint implements Serializable {
     private String type;
     private String Value;
     private String value;
+    // 辅助值：如避雷器读数值
+    private String value2;
     private String code;
     private String resImageUrl;
     private String imageNormalUrlPath;
@@ -117,6 +119,14 @@ public class AnalyseResPoint implements Serializable {
         this.pos = pos;
     }
 
+    public String getValue2() {
+        return this.value2;
+    }
+
+    public void setValue2(String value2) {
+        this.value2 = value2;
+    }
+
     @Override
     public boolean equals(Object object) {
         if (this == object) return true;

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

@@ -901,6 +901,8 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
                 || ("correction".equals(analyseResPoint.getType()) && Arrays.asList("2001", "2002", "2003").contains(analyseResPoint.getCode()) )) {
             AlgValue algValue = selectAlgMap(objectId, analyseResPoint.getType());
             resultAnalysisUtils.parseAlg(analyseResPoint.getType(), algValue, value, analyseResPoint.getDesc(), resultAnalysis);
+            // 合并辅助值字段
+            resultAnalysisUtils.mergeValue(analyseResPoint ,resultAnalysis);
         }
 
         return resultAnalysis;
@@ -919,7 +921,7 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
         PatrolTaskStatus patrolTaskStatus = new PatrolTaskStatus();
         patrolTaskStatus.setTaskPatrolledId(taskPatrolledId);
         List<PatrolTaskStatus> patrolTaskStatusList = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus);
-        log.info("CALC_REMOTE_ALGORITHM_PROGRESS patrolTaskStatusList size: {}", patrolTaskStatusList.size());
+        log.info("CALC_REMOTE_ALGORITHM_PROGRESS algorithmProgress： {}, patrolTaskStatusList size: {}", algorithmProgress, patrolTaskStatusList.size());
         if (!patrolTaskStatusList.isEmpty()) {
             patrolTaskStatus = patrolTaskStatusList.get(0);
             patrolTaskStatus.setTaskEstimatedTime(algorithmProgress);

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

@@ -4,11 +4,13 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.inspect.analysis.constant.AnalyseConstants;
 import com.inspect.analysis.domain.AlgValue;
+import com.inspect.analysis.domain.AnalyseResPoint;
 import com.inspect.analysis.domain.ResultAnalysis;
 import com.inspect.base.core.constant.AlgConstants;
 import com.inspect.base.core.utils.StringUtils;
 import com.inspect.message.MessageUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -61,6 +63,7 @@ public class ResultAnalysisUtils {
     public void parseAlg(String algType, AlgValue algValue, String value, String defaultDesc, ResultAnalysis resultAnalysis) {
         log.info("PARSE_ALG algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc);
 
+        // 初筛红外
         if ("1".equals(resultAnalysis.getFilter()) && algType != null &&
                 (algType.equals("infrared") ||
                         algType.equals("infra_1800") ||
@@ -454,6 +457,24 @@ public class ResultAnalysisUtils {
         log.info("------------------parseAlg resultAnalysis: {}", resultAnalysis);
     }
 
+    /**
+     * 将分析结果的辅助值进行合并展示
+     * @param analyseResPoint
+     * @param resultAnalysis
+     */
+    public void mergeValue(AnalyseResPoint analyseResPoint, ResultAnalysis resultAnalysis) {
+        String value2 = analyseResPoint.getValue2();
+        if (StringUtils.isNotEmpty(value2)) {
+            log.info("mergeValue analyseResPoint value2: {}", value2);
+            String value = analyseResPoint.getValue();
+            if(!NumberUtils.isCreatable(value2)) {
+                value2 = "null";
+            }
+            String val = String.join(",", value, value2);
+            resultAnalysis.setResValue(val);
+        }
+    }
+
     public static void main(String[] args) {
         String value = "[[121,108],[121,108]]";
         ObjectMapper mapper = new ObjectMapper();