Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

 Conflicts:

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

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

@@ -169,7 +169,9 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
                     || AlgConstants.INFRA_CAMERA.equals(algType)
                     || AlgConstants.INFRA_CAMERA_REVERSE.equals(algType)
                     || AlgConstants.INFRARED2.equals(algType)
-                    || "isolator".equals(algType))
+                    || "isolator".equals(algType)
+                    || "gis_meter".equals(algType)
+            )
             ) {
                 /*
                  * 先检查结果有缺无缺陷，如果有缺陷不用判断算法直接调用大模型；*

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

@@ -110,10 +110,10 @@ public class ResultAnalysisUtils {
             resultAnalysis.setResStatus("1");
             resultAnalysis.setPointStatus("1");
             resultAnalysis.setResultType("1");
-        } else if (algType.equals("meter")) {
-            log.info("------------------parseAlg : meter value: {}", value);
+        } else if (algType.equals("meter") || algType.equals("gis_meter")) {
+            log.info("------------------parseAlg : meter|gis_meter value: {}", value);
             if("open".equalsIgnoreCase(value)
-                || "closed".equalsIgnoreCase(value) || "Off".equalsIgnoreCase(value) || "On".equalsIgnoreCase(value)) {
+                    || "closed".equalsIgnoreCase(value) || "Off".equalsIgnoreCase(value) || "On".equalsIgnoreCase(value)) {
                 resultAnalysis.setResStatus("0");
                 resultAnalysis.setPointStatus("1");
                 resultAnalysis.setResultType("1");