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

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

@@ -34,6 +34,7 @@ public class ResultAnalysisUtils {
             resultAnalysis.setCreateTime(new Date());
             resultAnalysis.setPointStatus("1");
             resultAnalysis.setResStatus("0");
+            resultAnalysis.setResultType("1");
             return true;
         }
         if (AnalyseConstants.ANALYSE_FAIL_NO_FILE.equals(code)
@@ -304,19 +305,16 @@ public class ResultAnalysisUtils {
                 defaultDesc = "合";
             } else if (value.equals("3")) {
                 resultAnalysis.setPointStatus("0");
-                //resultAnalysis.setResultType("1");
                 resultAnalysis.setResultType("0");
                 resultAnalysis.setResStatus("0");
                 defaultDesc = "分位异常";
             } else if (value.equals("4")) {
                 resultAnalysis.setPointStatus("0");
-                //resultAnalysis.setResultType("1");
                 resultAnalysis.setResultType("0");
                 resultAnalysis.setResStatus("0");
                 defaultDesc = "合位异常";
             } else {
                 resultAnalysis.setPointStatus("0");
-                //resultAnalysis.setResultType("2");
                 resultAnalysis.setResultType("0");
                 resultAnalysis.setResStatus("0");
                 defaultDesc = "未检测到刀闸";