فهرست منبع

视频设备 拼接告警设备名称时 通道和设备名称一致时 不再拼接 设备名称

zhulu 1 سال پیش
والد
کامیت
669798bf5a

+ 7 - 1
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmDataServiceImpl.java

@@ -388,7 +388,13 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         IotAlarmData iotAlarmData = new IotAlarmData();
         iotAlarmData.setAlarmValue("异常");
         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.setSourceType(diagnosisType);
         iotAlarmData.setSourceTypeDes(AlarmVideoTypeEnum.getTextByValue(diagnosisType) + "告警");