/*红外初筛改出问题，回滚*/

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

@@ -5,6 +5,7 @@ import com.inspect.analysis.domain.AlgValue;
 import com.inspect.analysis.domain.ResultAnalysis;
 import com.inspect.base.core.utils.StringUtils;
 import com.inspect.message.MessageUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,11 +13,10 @@ import org.springframework.stereotype.Component;
 
 import java.util.Date;
 
+@Slf4j
 @Component
 public class ResultAnalysisUtils {
 
-    private final Logger log = LoggerFactory.getLogger(this.getClass());
-
     @Autowired
     private MessageUtils messageUtils;
 
@@ -124,24 +124,32 @@ public class ResultAnalysisUtils {
                 if(valueArr.length > 1) {
                     log.info("PARSE_ALG_METER_ALARM_VALUE_COMPOSITE value: {}", value);
                     resultAnalysis.setResStatus("0");
-                    resultAnalysis.setPointStatus("0");
+                    resultAnalysis.setPointStatus("1");
                     resultAnalysis.setResultType("0");
                     defaultDesc = messageUtils.get("正常");
                 } else {
-                    try {
                         log.info("PARSE_ALG_METER_ALARM_VALUE_SINGLE value: {}", value);
-                        Double.parseDouble(valueArr[0]);
-                        resultAnalysis.setResStatus("0");
-                        resultAnalysis.setPointStatus("0");
-                        resultAnalysis.setResultType("0");
-                        defaultDesc = messageUtils.get("表计超限");
-                    } catch (Exception e) {
-                        log.info("PARSE_ALG_METER_ALARM_VALUE_SINGLE_NO_DIGIT value: {}", value);
-                        resultAnalysis.setResStatus("0");
-                        resultAnalysis.setPointStatus("0");
-                        resultAnalysis.setResultType("0");
-                        defaultDesc = messageUtils.get("正常");
-                    }
+                        if(value.contains("分OFF")) {
+                            resultAnalysis.setResStatus("0");
+                            resultAnalysis.setPointStatus("1");
+                            resultAnalysis.setResultType("0");
+                            defaultDesc = messageUtils.get("正常");
+                        } else {
+                            try {
+                                Double.parseDouble(valueArr[0]);
+                                log.info("PARSE_ALG_METER_ALARM_VALUE_PARSE value: {}", valueArr[0]);
+                                resultAnalysis.setResStatus("0");
+                                resultAnalysis.setPointStatus("0");
+                                resultAnalysis.setResultType("0");
+                                defaultDesc = messageUtils.get("表计超限");
+                            } catch (Exception e) {
+                                log.info("PARSE_ALG_METER_ALARM_VALUE_SINGLE_NO_DIGIT value: {}", value);
+                                resultAnalysis.setResStatus("0");
+                                resultAnalysis.setPointStatus("1");
+                                resultAnalysis.setResultType("0");
+                                defaultDesc = messageUtils.get("正常");
+                            }
+                        }
                 }
             }
         } else if (algType.equals("sound")) {
@@ -179,15 +187,20 @@ public class ResultAnalysisUtils {
             }
 
             if (!algValue.isAlarm(value)) {
+                log.info("infrared no alarm value: {}, algValue: {}", value, algValue);
                 resultAnalysis.setResStatus("1");
                 resultAnalysis.setPointStatus("1");
                 resultAnalysis.setResultType("1");
-                defaultDesc = device + messageUtils.get("正常");
+                //defaultDesc = device + messageUtils.get("正常");
+                defaultDesc = messageUtils.get("正常");
             } else {
+                log.info("infrared alarm value: {}, algValue: {}", value, algValue);
                 resultAnalysis.setResStatus("0");
-                resultAnalysis.setPointStatus("2");
+                //resultAnalysis.setPointStatus("2");
+                resultAnalysis.setPointStatus("0");
                 resultAnalysis.setResultType("0");
-                defaultDesc = device + messageUtils.get("告警");
+                //defaultDesc = device + messageUtils.get("告警");
+                defaultDesc = messageUtils.get("温度异常告警");
             }
             if (messageUtils.get("分析失败").equals(defaultDesc)) {
                 defaultDesc = "-";

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRequestServiceImpl.java

@@ -97,11 +97,13 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService {
                 return;
             }
 
-            if (checkInfraredType2(typeList)) {
-                requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSE_FILTER_URL_INFRARED);
-                log.info("ANALYSE_FILTER_URL_INFRARED requestId: {}, requestUrl: {}", requestId, requestUrl);
-            } else {
+//            if (checkInfraredType2(typeList)) {
+//                requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSE_FILTER_URL_INFRARED);
+//                log.info("ANALYSE_FILTER_URL_INFRARED requestId: {}, requestUrl: {}", requestId, requestUrl);
+//            } else
+            {
                 requestUrl = patrolTaskService.selectConfigByKey(AnalyseConstants.ANALYSE_FILTER_URL);
+                log.info("ANALYSE_FILTER_URL requestId: {}, requestUrl: {}", requestId, requestUrl);
             }
 
         } else {