|
@@ -388,7 +388,13 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
|
|
|
IotAlarmData iotAlarmData = new IotAlarmData();
|
|
IotAlarmData iotAlarmData = new IotAlarmData();
|
|
|
iotAlarmData.setAlarmValue("异常");
|
|
iotAlarmData.setAlarmValue("异常");
|
|
|
iotAlarmData.setTime(LocalDateTime.now());
|
|
iotAlarmData.setTime(LocalDateTime.now());
|
|
|
- iotAlarmData.setDeviceName(deviceName + "-" + channelName);
|
|
|
|
|
|
|
+ if(ObjectUtil.equal(deviceName,channelName)){
|
|
|
|
|
+ iotAlarmData.setDeviceName(channelName);
|
|
|
|
|
+ }
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ iotAlarmData.setDeviceName(deviceName + "-" + channelName);
|
|
|
|
|
+ }
|
|
|
iotAlarmData.setRuleId(1L);
|
|
iotAlarmData.setRuleId(1L);
|
|
|
iotAlarmData.setSourceType(diagnosisType);
|
|
iotAlarmData.setSourceType(diagnosisType);
|
|
|
iotAlarmData.setSourceTypeDes(AlarmVideoTypeEnum.getTextByValue(diagnosisType) + "告警");
|
|
iotAlarmData.setSourceTypeDes(AlarmVideoTypeEnum.getTextByValue(diagnosisType) + "告警");
|