|
|
|
@ -150,8 +150,8 @@ public class ResultAnalysisUtils { |
|
|
|
resultAnalysis.setResultType("1"); |
|
|
|
} else if (algType.equals("switch")) { |
|
|
|
String[] values = value.split(StringUtils.COMMA); |
|
|
|
// value值:空|null|1|未识别-异常,灭-缺陷,亮|开|合|投入|其他-正常 |
|
|
|
boolean isDefect = Arrays.stream(values).anyMatch(v -> "灭".equals(v)); |
|
|
|
// value值:空|null|1|未识别-异常,灭|指示灯熄灭-缺陷,指示灯亮|亮|开|合|投入|其他-正常 |
|
|
|
boolean isDefect = Arrays.stream(values).anyMatch(v -> "灭".equals(v) || "指示灯熄灭".equals(v)); |
|
|
|
boolean isAbnormal = Arrays.stream(values).anyMatch(v -> "".equals(v) || "null".equals(v) || "1".equals(v) || "未识别".equals(v)); |
|
|
|
|
|
|
|
if (isDefect) { |
|
|
|
|