添加主机类告警

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotAlarmDataServiceImpl.java

@@ -1,7 +1,6 @@
 package com.xunmei.iot.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;

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

@@ -252,7 +252,7 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         iotAlarmData.setOperator("EQUALS");
         iotAlarmData.setValue("1");
         iotAlarmData.setValueText("告警");
-        iotAlarmData.setContent(iotAlarmData.getDeviceName() + "触发" + iotAlarmData.getSourceTypeDes() + "告警");
+        iotAlarmData.setContent(iotAlarmData.getDeviceName() + "触发" + iotAlarmData.getSourceTypeDes());
         iotAlarmData.setOrgId(orgId);
         iotAlarmData.setDataType(AlarmDataTypeEnum.HOST_ALARM.getValue());
         iotAlarmData.setDeviceId(hostCode);
@@ -345,7 +345,7 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         iotAlarmData.setOperator("EQUALS");
         iotAlarmData.setValue("1");
         iotAlarmData.setValueText("告警");
-        iotAlarmData.setContent(iotAlarmData.getDeviceName() + "触发" + iotAlarmData.getSourceTypeDes() + "告警");
+        iotAlarmData.setContent(iotAlarmData.getDeviceName() + "触发" + iotAlarmData.getSourceTypeDes());
         iotAlarmData.setOrgId(orgId);
         iotAlarmData.setDataType(AlarmDataTypeEnum.HOST_ALARM.getValue());
         iotAlarmData.setDeviceId(deviceId);
@@ -364,7 +364,7 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         iotAlarmData.setOperator(express.getOperator());
         iotAlarmData.setValue(express.getValue());
         iotAlarmData.setValueText(express.getValueText());
-        iotAlarmData.setContent(iotSensor.getDeviceName() + "触发" + field.getName());
+        iotAlarmData.setContent(iotSensor.getDeviceName() + "触发" + iotAlarmData.getSourceTypeDes());
         iotAlarmData.setOrgId(iotSensor.getOrgId());
         iotAlarmData.setDataType(AlarmDataTypeEnum.IOT_ALARM.getValue());
         iotAlarmData.setDeviceId(iotSensor.getDeviceCode());