分析结果desc翻译

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

@@ -171,7 +171,7 @@ public class AnalysisController extends BaseController {
 
                     logger.info("[ANALYSIS] RESULT CODE: {}, DESC: {}", code, description);
                     if ("meter normal".equals(description)) {
-                        description = "识别完成";
+                        description = messageUtils.get("识别完成");
                     }
 
                     resultAnalysis.setCreateTime(new Date());
@@ -392,17 +392,17 @@ public class AnalysisController extends BaseController {
                                             stringSet.add("0");
                                             pointStatus.add("1");
                                             restype.add("1");
-                                            resultAnalysis.setDescription("数值正常");
+                                            resultAnalysis.setDescription(messageUtils.get("数值正常"));
                                         } else {
                                             stringSet.add("0");
                                             pointStatus.add("2");
                                             restype.add("0");
                                             if (valuedoule < lower_value) {
-                                                resultAnalysis.setDescription("数值小于告警阈值最小值");
+                                                resultAnalysis.setDescription(messageUtils.get("数值小于告警阈值最小值"));
                                             }
 
                                             if (valuedoule > upper_value) {
-                                                resultAnalysis.setDescription("数值大于告警阈值最大值");
+                                                resultAnalysis.setDescription(messageUtils.get("数值大于告警阈值最大值"));
                                             }
                                         }
                                     } else {

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

@@ -451,7 +451,7 @@ public class ResultAnalysisController extends BaseController {
                 String desc = results.get(0).getDesc();
                 this.logger.info("======告警描述=======" + desc);
                 if (desc.contains("normal")) {
-                    desc = "识别完成";
+                    desc = messageUtils.get("识别完成");
                 }
 
                 resultAnalysis.setDescription(desc);

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

@@ -75,29 +75,29 @@ public class ResultAnalysis extends BaseEntity {
     public ResultAnalysis() {
     }
 
-    public boolean checkCode(String code, String desc) {
-        if (AnalyseConstants.ANALYSE_OK.equals(code)) {
-            setCreateTime(new Date());
-            return true;
-        }
-
-        if (AnalyseConstants.ANALYSE_FAIL_NO_FILE.equals(code)
-                || AnalyseConstants.ANALYSE_FAIL_FILE_EXCEPT.equals(code)
-                || AnalyseConstants.ANALYSE_FAIL_FILE_INCOMPATIBLE.equals(code)) {
-            setDescription(desc);
-        } else if (AnalyseConstants.ANALYSE_FAIL_ALG_EXCEPT.equals(code)) {
-            setDescription("算法内部异常");
-        } else {
-            setDescription("未知错误");
-            log.error("[ANALYSE RES] Error Return Code={}", code);
-        }
-
-        setPointStatus("0");
-        setResultType("2");
-        setResStatus("0");
-        setCreateTime(new Date());
-        return false;
-    }
+//    public boolean checkCode(String code, String desc) {
+//        if (AnalyseConstants.ANALYSE_OK.equals(code)) {
+//            setCreateTime(new Date());
+//            return true;
+//        }
+//
+//        if (AnalyseConstants.ANALYSE_FAIL_NO_FILE.equals(code)
+//                || AnalyseConstants.ANALYSE_FAIL_FILE_EXCEPT.equals(code)
+//                || AnalyseConstants.ANALYSE_FAIL_FILE_INCOMPATIBLE.equals(code)) {
+//            setDescription(desc);
+//        } else if (AnalyseConstants.ANALYSE_FAIL_ALG_EXCEPT.equals(code)) {
+//            setDescription("算法内部异常");
+//        } else {
+//            setDescription("未知错误");
+//            log.error("[ANALYSE RES] Error Return Code={}", code);
+//        }
+//
+//        setPointStatus("0");
+//        setResultType("2");
+//        setResStatus("0");
+//        setCreateTime(new Date());
+//        return false;
+//    }
 
     public static ResultAnalysis createInfrared(String businessId, String deviceId) {
         ResultAnalysis resultAnalysis = new ResultAnalysis();
@@ -303,136 +303,136 @@ public class ResultAnalysis extends BaseEntity {
 //        }
 //    }
 
-    public void parseAlg(String algType, AlgValue algValue, String value, String defaultDesc) {
-        log.warn("parseAlg algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc);
-        if (value == null) {
-            value = "";
-        }
-
-        value = algValue.formatValue(value);
-        if ("1".equals(this.filter)) {
-            algType = "";
-        }
-
-        if(StringUtils.isNull(algType)) {
-            log.warn("parseAlg algType is null!");
-            return;
-        }
-
-        if (value.isEmpty() || value.equals("-1")) {
-            this.setPointStatus("0");
-            this.setResultType("2");
-            this.setResStatus("0");
-            if ("meter".equals(algType)) {
-                defaultDesc = "与样本有差异";
-            } else {
-                defaultDesc = "算法内部异常";
-            }
-
-            this.setDescription(defaultDesc);
-            this.setCreateTime(new Date());
-            return;
-        }
-
-        if (algType.equals("qrcode")) {
-            this.setResStatus("1");
-            this.setPointStatus("1");
-            this.setResultType("1");
-        } else if (algType.equals("switch")) {
-            this.setResStatus("1");
-            this.setPointStatus("1");
-            this.setResultType("1");
-        } else if (algType.equals("light")) {
-            this.setResStatus("1");
-            this.setPointStatus("1");
-            this.setResultType("1");
-        } else if (algType.equals("meter")) {
-            if (!algValue.isAlarm(value)) {
-                this.setResStatus("0");
-                this.setPointStatus("1");
-                this.setResultType("1");
-                defaultDesc = "正常";
-            } else {
-                this.setResStatus("0");
-                this.setPointStatus("0");
-                this.setResultType("0");
-                defaultDesc = "表计超限";
-            }
-        } else if (algType.equals("sound")) {
-            if (value.equals("1")) {
-                this.setResStatus("1");
-                this.setPointStatus("1");
-                this.setResultType("1");
-                defaultDesc = "正常";
-            } else {
-                this.setResStatus("0");
-                this.setPointStatus("0");
-                this.setResultType("0");
-                defaultDesc = "异常";
-            }
-        } else if (algType.equals("infrared") ||
-                algType.equals("infra_1800") ||
-                algType.equals("infra_yu3") ||
-                algType.equals("infra_camera") ||
-                algType.equals("infra_camera_reverse") ||
-                algType.equals("xb")) {
-            String device = "";
-            if(algType.equals("infrared")) {
-                device = "红外";
-            } else if(algType.equals("infra_1800")) {
-                device = "红外1800";
-            } else if(algType.equals("infra_yu3")) {
-                device = "无人机红外";
-            } else if(algType.equals("infra_camera")) {
-                device = "摄像头红外";
-            } else if(algType.equals("infra_camera_reverse")) {
-                device = "摄像头红外灰度反算";
-            } else if(algType.equals("xb")) {
-                device = "形变";
-            }
-
-            if (!algValue.isAlarm(value)) {
-                this.setResStatus("1");
-                this.setPointStatus("1");
-                this.setResultType("1");
-                defaultDesc = device + "正常";
-            } else {
-                this.setResStatus("0");
-                this.setPointStatus("2");
-                this.setResultType("0");
-                defaultDesc = device + "告警";
-            }
-        } else if (algType.equals("isolator")) {
-            if (value.equals("3")) {
-                this.setPointStatus("1");
-                this.setResultType("1");
-                this.setResStatus("0");
-            } else if (value.equals("4")) {
-                this.setPointStatus("1");
-                this.setResultType("1");
-                this.setResStatus("0");
-            } else {
-                this.setPointStatus("0");
-                this.setResultType("2");
-                this.setResStatus("0");
-            }
-        } else {
-            if (value.equals("0")) {
-                this.setPointStatus("1");
-                this.setResultType("1");
-                this.setResStatus("2");
-                defaultDesc = "正常";
-                this.setResDesc(defaultDesc);
-                this.setSuggestion("系统审核");
-            } else if (value.equals("1")) {
-                this.setPointStatus("0");
-                this.setResultType("0");
-                this.setResStatus("0");
-            }
-        }
-        this.setDescription(defaultDesc);
-        this.setCreateTime(new Date());
-    }
+//    public void parseAlg(String algType, AlgValue algValue, String value, String defaultDesc) {
+//        log.warn("parseAlg algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc);
+//        if (value == null) {
+//            value = "";
+//        }
+//
+//        value = algValue.formatValue(value);
+//        if ("1".equals(this.filter)) {
+//            algType = "";
+//        }
+//
+//        if(StringUtils.isNull(algType)) {
+//            log.warn("parseAlg algType is null!");
+//            return;
+//        }
+//
+//        if (value.isEmpty() || value.equals("-1")) {
+//            this.setPointStatus("0");
+//            this.setResultType("2");
+//            this.setResStatus("0");
+//            if ("meter".equals(algType)) {
+//                defaultDesc = "与样本有差异";
+//            } else {
+//                defaultDesc = "算法内部异常";
+//            }
+//
+//            this.setDescription(defaultDesc);
+//            this.setCreateTime(new Date());
+//            return;
+//        }
+//
+//        if (algType.equals("qrcode")) {
+//            this.setResStatus("1");
+//            this.setPointStatus("1");
+//            this.setResultType("1");
+//        } else if (algType.equals("switch")) {
+//            this.setResStatus("1");
+//            this.setPointStatus("1");
+//            this.setResultType("1");
+//        } else if (algType.equals("light")) {
+//            this.setResStatus("1");
+//            this.setPointStatus("1");
+//            this.setResultType("1");
+//        } else if (algType.equals("meter")) {
+//            if (!algValue.isAlarm(value)) {
+//                this.setResStatus("0");
+//                this.setPointStatus("1");
+//                this.setResultType("1");
+//                defaultDesc = "正常";
+//            } else {
+//                this.setResStatus("0");
+//                this.setPointStatus("0");
+//                this.setResultType("0");
+//                defaultDesc = "表计超限";
+//            }
+//        } else if (algType.equals("sound")) {
+//            if (value.equals("1")) {
+//                this.setResStatus("1");
+//                this.setPointStatus("1");
+//                this.setResultType("1");
+//                defaultDesc = "正常";
+//            } else {
+//                this.setResStatus("0");
+//                this.setPointStatus("0");
+//                this.setResultType("0");
+//                defaultDesc = "异常";
+//            }
+//        } else if (algType.equals("infrared") ||
+//                algType.equals("infra_1800") ||
+//                algType.equals("infra_yu3") ||
+//                algType.equals("infra_camera") ||
+//                algType.equals("infra_camera_reverse") ||
+//                algType.equals("xb")) {
+//            String device = "";
+//            if(algType.equals("infrared")) {
+//                device = "红外";
+//            } else if(algType.equals("infra_1800")) {
+//                device = "红外1800";
+//            } else if(algType.equals("infra_yu3")) {
+//                device = "无人机红外";
+//            } else if(algType.equals("infra_camera")) {
+//                device = "摄像头红外";
+//            } else if(algType.equals("infra_camera_reverse")) {
+//                device = "摄像头红外灰度反算";
+//            } else if(algType.equals("xb")) {
+//                device = "形变";
+//            }
+//
+//            if (!algValue.isAlarm(value)) {
+//                this.setResStatus("1");
+//                this.setPointStatus("1");
+//                this.setResultType("1");
+//                defaultDesc = device + "正常";
+//            } else {
+//                this.setResStatus("0");
+//                this.setPointStatus("2");
+//                this.setResultType("0");
+//                defaultDesc = device + "告警";
+//            }
+//        } else if (algType.equals("isolator")) {
+//            if (value.equals("3")) {
+//                this.setPointStatus("1");
+//                this.setResultType("1");
+//                this.setResStatus("0");
+//            } else if (value.equals("4")) {
+//                this.setPointStatus("1");
+//                this.setResultType("1");
+//                this.setResStatus("0");
+//            } else {
+//                this.setPointStatus("0");
+//                this.setResultType("2");
+//                this.setResStatus("0");
+//            }
+//        } else {
+//            if (value.equals("0")) {
+//                this.setPointStatus("1");
+//                this.setResultType("1");
+//                this.setResStatus("2");
+//                defaultDesc = "正常";
+//                this.setResDesc(defaultDesc);
+//                this.setSuggestion("系统审核");
+//            } else if (value.equals("1")) {
+//                this.setPointStatus("0");
+//                this.setResultType("0");
+//                this.setResStatus("0");
+//            }
+//        }
+//        this.setDescription(defaultDesc);
+//        this.setCreateTime(new Date());
+//    }
 
     @Override
     public String toString() {

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

@@ -9,6 +9,7 @@ import com.inspect.analysis.domain.*;
 import com.inspect.analysis.service.IAnalysisLogService;
 import com.inspect.analysis.service.IAnalysisService;
 import com.inspect.analysis.service.IResultAnalysisService;
+import com.inspect.analysis.utils.ResultAnalysisUtils;
 import com.inspect.base.core.constant.AlgConstants;
 import com.inspect.base.core.constant.Color;
 import com.inspect.base.core.constant.RedisConst;
@@ -68,6 +69,9 @@ public class AnalysisServiceImpl implements IAnalysisService {
     @Resource
     private MessageUtils messageUtils;
 
+    @Resource
+    private ResultAnalysisUtils resultAnalysisUtils;
+
     @Override
     public void picAnalyseRetNotify(AnalyseResult analyseResult) {
         log.info(Color.CYAN + "###### 分析算法模块返回的表计识别结果 start, analyseResult:{} ######" + Color.END, analyseResult);
@@ -210,7 +214,7 @@ public class AnalysisServiceImpl implements IAnalysisService {
 
                         log.info("doAlgorithmAnalysis RESULT CODE: {}, DESC: {}", code, description);
                         if ("meter normal".equals(description)) {
-                            description = "识别完成";
+                            description = messageUtils.get("识别完成");
                         }
 
                         resultAnalysis.setCreateTime(new Date());
@@ -457,17 +461,17 @@ public class AnalysisServiceImpl implements IAnalysisService {
                                             stringSet.add("0");
                                             pointStatus.add("1");
                                             restype.add("1");
-                                            resultAnalysis.setDescription("数值正常");
+                                            resultAnalysis.setDescription(messageUtils.get("数值正常"));
                                         } else {
                                             stringSet.add("0");
                                             pointStatus.add("2");
                                             restype.add("0");
                                             if (valuedoule < lower_value) {
-                                                resultAnalysis.setDescription("数值小于告警阈值最小值");
+                                                resultAnalysis.setDescription(messageUtils.get("数值小于告警阈值最小值"));
                                             }
 
                                             if (valuedoule > upper_value) {
-                                                resultAnalysis.setDescription("数值大于告警阈值最大值");
+                                                resultAnalysis.setDescription(messageUtils.get("数值大于告警阈值最大值"));
                                             }
                                         }
                                     } else {
@@ -732,9 +736,13 @@ public class AnalysisServiceImpl implements IAnalysisService {
         resultAnalysis.setResPos(analyseResPoint.getPos() == null ? StringUtils.EMPTY : JSONObject.toJSONString(analyseResPoint.getPos()));
         String value = analyseResPoint.getValue();
         resultAnalysis.setFilter(analyseResult.getFilter());
-        if (resultAnalysis.checkCode(analyseResPoint.getCode(), analyseResPoint.getDesc())) {
+//        if (resultAnalysis.checkCode(analyseResPoint.getCode(), analyseResPoint.getDesc())) {
+//            AlgValue algValue = selectAlgMap(objectId, analyseResPoint.getType());
+//            resultAnalysis.parseAlg(analyseResPoint.getType(), algValue, value, analyseResPoint.getDesc());
+//        }
+        if (resultAnalysisUtils.checkCode(analyseResPoint.getCode(), analyseResPoint.getDesc(), resultAnalysis)) {
             AlgValue algValue = selectAlgMap(objectId, analyseResPoint.getType());
-            resultAnalysis.parseAlg(analyseResPoint.getType(), algValue, value, analyseResPoint.getDesc());
+            resultAnalysisUtils.parseAlg(analyseResPoint.getType(), algValue, value, analyseResPoint.getDesc(), resultAnalysis);
         }
 
         return resultAnalysis;

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

@@ -0,0 +1,177 @@
+package com.inspect.analysis.utils;
+
+import com.inspect.analysis.constant.AnalyseConstants;
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+@Component
+public class ResultAnalysisUtils {
+
+    private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    private MessageUtils messageUtils;
+
+    public boolean checkCode(String code, String desc, ResultAnalysis resultAnalysis) {
+        if (AnalyseConstants.ANALYSE_OK.equals(code)) {
+            resultAnalysis.setCreateTime(new Date());
+            return true;
+        }
+
+        if (AnalyseConstants.ANALYSE_FAIL_NO_FILE.equals(code)
+                || AnalyseConstants.ANALYSE_FAIL_FILE_EXCEPT.equals(code)
+                || AnalyseConstants.ANALYSE_FAIL_FILE_INCOMPATIBLE.equals(code)) {
+            resultAnalysis.setDescription(desc);
+        } else if (AnalyseConstants.ANALYSE_FAIL_ALG_EXCEPT.equals(code)) {
+            resultAnalysis.setDescription(messageUtils.get("算法内部异常"));
+        } else {
+            resultAnalysis.setDescription(messageUtils.get("未知错误"));
+            log.error("[ANALYSE RES] Error Return Code={}", code);
+        }
+
+        resultAnalysis.setPointStatus("0");
+        resultAnalysis.setResultType("2");
+        resultAnalysis.setResStatus("0");
+        resultAnalysis.setCreateTime(new Date());
+        return false;
+    }
+
+    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 (value == null) {
+            value = "";
+        }
+
+        value = algValue.formatValue(value);
+        if ("1".equals(resultAnalysis.getFilter())) {
+            algType = "";
+        }
+
+        if(StringUtils.isNull(algType)) {
+            log.warn("parseAlg algType is null!");
+            return;
+        }
+
+        if (value.isEmpty() || value.equals("-1")) {
+            resultAnalysis.setPointStatus("0");
+            resultAnalysis.setResultType("2");
+            resultAnalysis.setResStatus("0");
+            if ("meter".equals(algType)) {
+                defaultDesc = messageUtils.get("与样本有差异");
+            } else {
+                defaultDesc = messageUtils.get("算法内部异常");
+            }
+
+            resultAnalysis.setDescription(defaultDesc);
+            resultAnalysis.setCreateTime(new Date());
+            return;
+        }
+
+        if (algType.equals("qrcode")) {
+            resultAnalysis.setResStatus("1");
+            resultAnalysis.setPointStatus("1");
+            resultAnalysis.setResultType("1");
+        } else if (algType.equals("switch")) {
+            resultAnalysis.setResStatus("1");
+            resultAnalysis.setPointStatus("1");
+            resultAnalysis.setResultType("1");
+        } else if (algType.equals("light")) {
+            resultAnalysis.setResStatus("1");
+            resultAnalysis.setPointStatus("1");
+            resultAnalysis.setResultType("1");
+        } else if (algType.equals("meter")) {
+            if (!algValue.isAlarm(value)) {
+                resultAnalysis.setResStatus("0");
+                resultAnalysis.setPointStatus("1");
+                resultAnalysis.setResultType("1");
+                defaultDesc = messageUtils.get("正常");
+            } else {
+                resultAnalysis.setResStatus("0");
+                resultAnalysis.setPointStatus("0");
+                resultAnalysis.setResultType("0");
+                defaultDesc = messageUtils.get("表计超限");
+            }
+        } else if (algType.equals("sound")) {
+            if (value.equals("1")) {
+                resultAnalysis.setResStatus("1");
+                resultAnalysis.setPointStatus("1");
+                resultAnalysis.setResultType("1");
+                defaultDesc = messageUtils.get("正常");
+            } else {
+                resultAnalysis.setResStatus("0");
+                resultAnalysis.setPointStatus("0");
+                resultAnalysis.setResultType("0");
+                defaultDesc = messageUtils.get("异常");
+            }
+        } else if (algType.equals("infrared") ||
+                algType.equals("infra_1800") ||
+                algType.equals("infra_yu3") ||
+                algType.equals("infra_camera") ||
+                algType.equals("infra_camera_reverse") ||
+                algType.equals("xb")) {
+            String device = "";
+            if(algType.equals("infrared")) {
+                device = messageUtils.get("红外");
+            } else if(algType.equals("infra_1800")) {
+                device = messageUtils.get("红外1800");
+            } else if(algType.equals("infra_yu3")) {
+                device = messageUtils.get("无人机红外");
+            } else if(algType.equals("infra_camera")) {
+                device = messageUtils.get("摄像头红外");
+            } else if(algType.equals("infra_camera_reverse")) {
+                device = messageUtils.get("摄像头红外灰度反算");
+            } else if(algType.equals("xb")) {
+                device = messageUtils.get("形变");
+            }
+
+            if (!algValue.isAlarm(value)) {
+                resultAnalysis.setResStatus("1");
+                resultAnalysis.setPointStatus("1");
+                resultAnalysis.setResultType("1");
+                defaultDesc = device + messageUtils.get("正常");
+            } else {
+                resultAnalysis.setResStatus("0");
+                resultAnalysis.setPointStatus("2");
+                resultAnalysis.setResultType("0");
+                defaultDesc = device + messageUtils.get("告警");
+            }
+        } else if (algType.equals("isolator")) {
+            if (value.equals("3")) {
+                resultAnalysis.setPointStatus("1");
+                resultAnalysis.setResultType("1");
+                resultAnalysis.setResStatus("0");
+            } else if (value.equals("4")) {
+                resultAnalysis.setPointStatus("1");
+                resultAnalysis.setResultType("1");
+                resultAnalysis.setResStatus("0");
+            } else {
+                resultAnalysis.setPointStatus("0");
+                resultAnalysis.setResultType("2");
+                resultAnalysis.setResStatus("0");
+            }
+        } else {
+            if (value.equals("0")) {
+                resultAnalysis.setPointStatus("1");
+                resultAnalysis.setResultType("1");
+                resultAnalysis.setResStatus("2");
+                defaultDesc = messageUtils.get("正常");
+                resultAnalysis.setResDesc(defaultDesc);
+                resultAnalysis.setSuggestion(messageUtils.get("系统审核"));
+            } else if (value.equals("1")) {
+                resultAnalysis.setPointStatus("0");
+                resultAnalysis.setResultType("0");
+                resultAnalysis.setResStatus("0");
+            }
+        }
+        resultAnalysis.setDescription(defaultDesc);
+        resultAnalysis.setCreateTime(new Date());
+    }
+}

inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java

@@ -192,6 +192,30 @@ public class MessageUtils {
 					return "video";
 				case "空值":
 					return "null";
+				case "算法内部异常":
+					return "algorithm internal exception";
+				case "未知错误":
+					return "unknown error";
+				case "与样本有差异":
+					return "difference from sample";
+				case "表计超限":
+					return "meter limit exceeded";
+				case "红外":
+					return "infrared";
+				case "告警":
+					return "alarm";
+				case "系统审核":
+					return "system review";
+				case "数值正常":
+					return "normal value";
+				case "数值小于告警阈值最小值":
+					return "value less than minimum alarm threshold";
+				case "数值大于告警阈值最大值":
+					return "value greater than maximum alarm threshold";
+				case "巡视异常":
+					return "patrol abnormal";
+				case "识别完成":
+					return "recognition complete";
 				default:
 			        return key;
 			}

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

@@ -37,6 +37,7 @@ import com.inspect.base.core.domain.maintain.MaintainRegion;
 import com.inspect.maintain.domain.MaintainAreaXML;
 import com.inspect.maintain.domain.PatrolMaintainModuleXml;
 import com.inspect.maintain.service.IMaintainRegionService;
+import com.inspect.message.MessageUtils;
 import com.inspect.mqtt.services.Warn.IUploadServer;
 import com.inspect.partrolresult.client.BaseDataClient;
 import com.inspect.partrolresult.client.WebsocketService;
@@ -165,6 +166,9 @@ public class PatrolResultController extends BaseController {
     @Resource
     private AnalyseRemoteService analyseRemoteService;
 
+    @Resource
+    private MessageUtils messageUtils;
+
     @GetMapping({"/list"})
     public TableDataInfo list(PatrolResult patrolResult) {
         String mainId = patrolResult.getMainId();
@@ -1494,29 +1498,29 @@ public class PatrolResultController extends BaseController {
                     resultAnalysis.setResultType("1");
                     resultAnalysis.setResStatus("1");
                     resultAnalysis.setPointStatus("1");
-                    resultAnalysis.setDescription("数值正常");
+                    resultAnalysis.setDescription(messageUtils.get("数值正常"));
                 } else if (parsedDouble > lowerValue && parsedDouble < upperValue) {
                     resultAnalysis.setResultType("1");
                     resultAnalysis.setResStatus("1");
                     resultAnalysis.setPointStatus("1");
-                    resultAnalysis.setDescription("数值正常");
+                    resultAnalysis.setDescription(messageUtils.get("数值正常"));
                 } else {
                     resultAnalysis.setResultType("0");
                     resultAnalysis.setResStatus("0");
                     resultAnalysis.setPointStatus("0");
                     if (parsedDouble < lowerValue) {
-                        resultAnalysis.setDescription("数值小于告警阈值最小值");
+                        resultAnalysis.setDescription(messageUtils.get("数值小于告警阈值最小值"));
                     }
 
                     if (parsedDouble > upperValue) {
-                        resultAnalysis.setDescription("数值大于告警阈值最大值");
+                        resultAnalysis.setDescription(messageUtils.get("数值大于告警阈值最大值"));
                     }
                 }
             } else {
                 resultAnalysis.setResultType("2");
                 resultAnalysis.setResStatus("0");
                 resultAnalysis.setPointStatus("0");
-                resultAnalysis.setDescription("巡视异常");
+                resultAnalysis.setDescription(messageUtils.get("巡视异常"));
             }
 
             resultAnalysis.setBusinessId(String.valueOf(pr.getLineId()));