|
@@ -114,14 +114,13 @@ public class DeviceAlarmServiceImpl implements DeviceAlarmService {
|
|
|
String measuringCode = rule.getMeasuringCode();
|
|
|
|
|
|
Object measuringValue = measureDataDto.getMeasureMap().get(measuringCode);
|
|
|
- log.info("measuringValue = {},{}",measuringCode,JSON.toJSONString(measuringValue));
|
|
|
if(measuringValue == null) {
|
|
|
isOk = false;
|
|
|
continue;
|
|
|
}
|
|
|
Boolean isAlarm = checkIsAlarm(rule,measuringValue);
|
|
|
isOk = isOk && isAlarm;
|
|
|
- log.info("isAlarm = {},{}",isAlarm,JSON.toJSONString(rule));
|
|
|
+ //log.info("isAlarm = {},{}",isAlarm,JSON.toJSONString(rule));
|
|
|
if(isOk){
|
|
|
List<MeasuringPointVo> pointVoList = deviceMeasuringPointService.getMeasuringPoint(device.getProductId());
|
|
|
measuringData.append(getMeasuringData(String.valueOf(measuringValue), measuringCode, pointVoList));
|