|
|
@ -112,8 +112,8 @@ public class ResultAnalysisUtils { |
|
|
resultAnalysis.setResultType("1"); |
|
|
resultAnalysis.setResultType("1"); |
|
|
} else if (algType.equals("meter")) { |
|
|
} else if (algType.equals("meter")) { |
|
|
log.info("------------------parseAlg : meter value: {}", value); |
|
|
log.info("------------------parseAlg : meter value: {}", value); |
|
|
if("open".equals(value) |
|
|
|
|
|
|| "closed".equals(value)) { |
|
|
|
|
|
|
|
|
if("open".equalsIgnoreCase(value) |
|
|
|
|
|
|| "closed".equalsIgnoreCase(value) || "Off".equalsIgnoreCase(value) || "On".equalsIgnoreCase(value)) { |
|
|
resultAnalysis.setResStatus("0"); |
|
|
resultAnalysis.setResStatus("0"); |
|
|
resultAnalysis.setPointStatus("1"); |
|
|
resultAnalysis.setPointStatus("1"); |
|
|
resultAnalysis.setResultType("1"); |
|
|
resultAnalysis.setResultType("1"); |
|
|
@ -158,7 +158,7 @@ public class ResultAnalysisUtils { |
|
|
//resultAnalysis.setPointStatus("1"); |
|
|
//resultAnalysis.setPointStatus("1"); |
|
|
resultAnalysis.setPointStatus("0"); |
|
|
resultAnalysis.setPointStatus("0"); |
|
|
// resultAnalysis.setResultType("0"); |
|
|
// resultAnalysis.setResultType("0"); |
|
|
resultAnalysis.setResultType("0"); |
|
|
|
|
|
|
|
|
resultAnalysis.setResultType("2"); |
|
|
defaultDesc = messageUtils.get("异常"); |
|
|
defaultDesc = messageUtils.get("异常"); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|