/*继保机器狗红外测温结果值展示*/

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

@@ -47,7 +47,8 @@ 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);
 
-        if ("1".equals(resultAnalysis.getFilter()) && algType != null && (algType.equals("infrared") ||
+        if ("1".equals(resultAnalysis.getFilter()) && algType != null &&
+                (algType.equals("infrared") ||
                 algType.equals("infra_1800") ||
                 algType.equals("infra_yu3") ||
                 algType.equals("infra_camera") ||
@@ -83,7 +84,7 @@ public class ResultAnalysisUtils {
             resultAnalysis.setPointStatus("0");
             resultAnalysis.setResultType("2");
             resultAnalysis.setResStatus("0");
-            if ("meter".equals(algType)) {
+            if ("meter".equals(algType) || "infrared".equals(algType)) {
                 //defaultDesc = messageUtils.get("与样本有差异");
                 defaultDesc = messageUtils.get("读数失败");
             } else {

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -965,6 +965,10 @@ public class PatrolResultController extends BaseController {
                         //analyseRemoteService.sendRequest(analyseReq, filterList.get(0).getTypeList(), "1".equals(meterFilter));
                         analyseReq.setAlgorithmType("filterAlgorithm");
                         analyseReq.setFilter("1".equals(meterFilter));
+                        analyseReq.setValue(patrolResult.getValue());
+                        analyseReq.setUnit(patrolResult.getUnit());
+                        analyseReq.setValueUnit(patrolResult.getValueUnit());
+                        analyseReq.setValueType(patrolResult.getValueType());
                         analyseReq.setTypeList(filterList.get(0).getTypeList());
                         String requestDataToRedis = new Gson().toJson(analyseReq);
                         logger.info("callRemoteAlgorithm filterList requestDataToRedis: {}", requestDataToRedis);

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/domain/AnalyseRequest.java

@@ -36,6 +36,10 @@ public class AnalyseRequest implements RetryableRequest, Serializable {
     private int retryCount;
     private String requestUrl;
     private String redissonTime;
+    private String value;
+    private String unit;
+    private String valueUnit;
+    private String valueType;
 
     public AnalyseRequest() {
 
@@ -84,6 +88,35 @@ public class AnalyseRequest implements RetryableRequest, Serializable {
         return JSONObject.toJSONString(analyseResult);
     }
 
+    public String toInfraredResultStr() {
+        AnalyseResult analyseResult = new AnalyseResult();
+        analyseResult.setRequestId(this.requestId);
+        analyseResult.setCompensate(true);
+        analyseResult.setFilter(this.isFilter ? "1" : "0");
+        analyseResult.setTaskPatrolId(this.getTaskPatrolId());
+        List<AnalyseResItem> list = new ArrayList<>();
+        analyseResult.setResultsList(list);
+
+        for (AnalyseReqItem analyseReqItem : this.objectList) {
+            AnalyseResItem analyseResItem = new AnalyseResItem();
+            list.add(analyseResItem);
+            analyseResItem.setObjectId(analyseReqItem.getObjectId());
+            List<AnalyseResPoint> results = new ArrayList<>();
+            analyseResItem.setResults(results);
+            for (String type : analyseReqItem.getTypeList()) {
+                AnalyseResPoint analyseResPoint = new AnalyseResPoint();
+                analyseResPoint.setCode("2000");
+                analyseResPoint.setType(type);
+                analyseResPoint.setDesc("-");
+                analyseResPoint.setResImageUrl(analyseReqItem.getImageUrlList()[0]);
+                analyseResPoint.setValue(this.value);
+                results.add(analyseResPoint);
+            }
+        }
+
+        return JSONObject.toJSONString(analyseResult);
+    }
+
     public String toString() {
         return JSONObject.toJSONString(this);
     }

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

@@ -87,7 +87,7 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService {
             analyseReqItem.setTypeList(typeList);
             analyseReq.setObjectList(Collections.singletonList(analyseReqItem));
             if (checkOldInfraredType(typeList)) {
-                log.info("ANALYSIS_FILTER_URL_OLD_INFRARED requestId: {}", requestId);
+                log.info("ANALYSIS_FILTER_URL_OLD_INFRARED requestId: {}, analyseReq: {}", requestId, analyseReq);
                 sendCompensateRequest(analyseReq);
                 return;
             }
@@ -170,7 +170,19 @@ public class AnalyseRequestServiceImpl implements IAnalyseRequestService {
 
     public void sendCompensateRequest(AnalyseRequest request) {
         final String defaultUrl = "http://localhost:" + this.port + AnalyseConstants.ANALYSE_RET_URI;
-        HttpClientUtils.sendPostAgain(defaultUrl, request.toErrorResultStr());
+        String[] typeList = request.getTypeList();
+        if(typeList == null || typeList.length == 0) {
+            log.info("SEND_COMPENSATE_REQUEST typeList empty: {}", request);
+            return;
+        }
+
+        boolean containsInfrared = Arrays.asList(typeList).contains("infrared");
+        log.info("SEND_COMPENSATE_REQUEST containsInfrared: {}, request: {}", containsInfrared, request);
+        if(containsInfrared) {
+            HttpClientUtils.sendPostAgain(defaultUrl, request.toInfraredResultStr());
+        } else {
+            HttpClientUtils.sendPostAgain(defaultUrl, request.toErrorResultStr());
+        }
     }
 
     private static final Set<String> INFRARED_TYPES = new HashSet<>(Arrays.asList(