|
|
@@ -207,14 +207,14 @@ public class RSServerService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 只有非节点1才判断湿度报警(节点1无湿度数据)
|
|
|
+ // 只有非节点2才判断cod
|
|
|
if (nodeId == 2 && !Float.isNaN(nd.getHum())) {
|
|
|
- String humWarningCode = "WARN-HUMIDITY";
|
|
|
+ String humWarningCode = "WARN-COD";
|
|
|
WarningThreshold humThreshold = checkThreshold(deviceId, humWarningCode);
|
|
|
Double humMinValue = humThreshold != null ? humThreshold.getMinValue() : null;
|
|
|
- Double humMaxValue = humThreshold != null ? humThreshold.getMaxValue() : 90.0;
|
|
|
- String humWarningType = humThreshold != null ? humThreshold.getWarningType() : "湿度预警";
|
|
|
- String humRemark = humThreshold != null ? humThreshold.getRemark() : "环境湿度报警";
|
|
|
+ Double humMaxValue = humThreshold != null ? humThreshold.getMaxValue() : 40.0;
|
|
|
+ String humWarningType = humThreshold != null ? humThreshold.getWarningType() : "COD预警";
|
|
|
+ String humRemark = humThreshold != null ? humThreshold.getRemark() : "环境COD报警";
|
|
|
|
|
|
boolean humShouldAlarm = false;
|
|
|
BigDecimal humValue = BigDecimal.valueOf(finalValue);
|