添加主机类告警

soc-modules/soc-modules-iot/src/main/resources/mapper/IotAlarmDataMapper.xml

@@ -22,6 +22,9 @@
         <if test="param.orgPath != null and param.orgPath != ''">
             and b.path like concat(#{param.orgPath},'%')
         </if>
+        <if test="param.dataType != null and param.dataType != ''">
+            and a.data_type = #{param.dataType}
+        </if>
         <if test="param.deviceType != null and param.deviceType != ''">
             and a.source_type = #{param.deviceType}
         </if>

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

@@ -241,7 +241,7 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         iotAlarmData.setDeviceName(equipmentName + "-" + diskName);
         iotAlarmData.setRuleId(1L);
         iotAlarmData.setSourceType(AlarmVideoTypeEnum.DVRDISK.getValue());
-        iotAlarmData.setSourceTypeDes(AlarmVideoTypeEnum.getTextByValue(AlarmVideoTypeEnum.DVRDISK.getValue()));
+        iotAlarmData.setSourceTypeDes(AlarmVideoTypeEnum.getTextByValue(AlarmVideoTypeEnum.DVRDISK.getValue())+"告警");
         iotAlarmData.setFieldCode(AlarmVideoTypeEnum.DVRDISK.getValue() + "");
         iotAlarmData.setOperator("EQUALS");
         iotAlarmData.setValue("1");
@@ -334,7 +334,7 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         iotAlarmData.setDeviceName(deviceName + "-" + channelName);
         iotAlarmData.setRuleId(1L);
         iotAlarmData.setSourceType(diagnosisType);
-        iotAlarmData.setSourceTypeDes(AlarmVideoTypeEnum.getTextByValue(diagnosisType));
+        iotAlarmData.setSourceTypeDes(AlarmVideoTypeEnum.getTextByValue(diagnosisType)+"告警");
         iotAlarmData.setFieldCode(diagnosisType + "");
         iotAlarmData.setOperator("EQUALS");
         iotAlarmData.setValue("1");
@@ -353,7 +353,7 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         iotAlarmData.setDeviceName(iotSensor.getDeviceName());
         iotAlarmData.setRuleId(express.getRuleId());
         iotAlarmData.setSourceType(field.getSourceType());
-        iotAlarmData.setSourceTypeDes(field.getSourceTypeDes());
+        iotAlarmData.setSourceTypeDes(field.getSourceTypeDes()+"告警");
         iotAlarmData.setFieldCode(field.getSysFieldCode());
         iotAlarmData.setOperator(express.getOperator());
         iotAlarmData.setValue(express.getValue());