soc-modules-iot模块后台代码-iot_alarm_system_field表修改后，同步更新物联设备信息和告警中心模块的功能

project_data/sql/0.1.1/soc/soc.sql

@@ -1285,21 +1285,21 @@ INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_p
 INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('FSU_DoPowerControlBoxButton', 'DO8小时控电箱按钮', 'status', '按钮状态', '{\"0\": \"弹起\",\"1\": \"按下\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 0);
 INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('FSU_DoPowerCollection8Hour', '8小时回路', 'status', '8小时回路通电状态', '{\"0\": \"断电\",\"1\": \"通电\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 1, 6);
 INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('FSU_DoPowerCollection24Hour', '24小时回路', 'status', '24小时回路缺相状态', '{\"0\": \"缺相\",\"1\": \"通电\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 1, 7);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Humidity', '湿度（报警主机）', 'status', '湿度', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 1);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Temperature', '温度（报警主机）', 'status', '温度', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 2);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Smoke', '烟感（报警主机）', 'status', '烟感', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 3);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Infrared', '红外（报警主机）', 'status', '红外', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 4);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Soaking', '水浸（报警主机）', 'status', '水浸', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 5);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_DoorSensor', '门磁（报警主机）', 'status', '门磁', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 6);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Other', '其他（报警主机）', 'status', '其他', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 7);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Displacement', '位移（报警主机）', 'status', '位移', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 8);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Broken', '破碎（报警主机）', 'status', '破碎', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 9);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Shock', '震动（报警主机）', 'status', '震动', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 10);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Tamper', '防拆', 'status', '防拆', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 11);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Intrusion', '入侵', 'status', '入侵', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 12);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_IMDualIdentification', '红外微波双鉴', 'status', '红外微波双鉴', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 13);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Microwave', '微波', 'status', '微波', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 14);
-INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_EmergencyButton', '紧急按钮', 'status', '紧急按钮', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 15);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Humidity', '湿度传感器', 'status', '湿度', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 1);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Temperature', '温度传感器', 'status', '温度', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 2);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Smoke', '烟感传感器', 'status', '烟感', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 3);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Infrared', '红外传感器', 'status', '红外', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 4);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Soaking', '水浸传感器', 'status', '水浸', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 5);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_DoorSensor', '门磁传感器', 'status', '门磁', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 6);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Other', '其他传感器', 'status', '其他', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 7);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Displacement', '位移传感器', 'status', '位移', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 8);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Broken', '破碎传感器', 'status', '破碎', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 9);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Shock', '震动传感器', 'status', '震动', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 10);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Tamper', '防拆传感器', 'status', '防拆', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 11);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Intrusion', '入侵传感器', 'status', '入侵', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 12);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_IMDualIdentification', '红外微波双鉴传感器', 'status', '红外微波双鉴', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 13);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_Microwave', '微波传感器', 'status', '微波', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 14);
+INSERT INTO `iot_alarm_system_field` (`product_type`, `product_name`, `product_property`, `product_property_display_name`, `specs`, `operators`, `type`, `type_des`, `unit`, `enable`, `alarm_rule_property`, `order`) VALUES ('AlarmHostInput_EmergencyButton', '紧急按钮传感器', 'status', '紧急按钮', '{\"alarm\": \"报警\",\"bypassAlarm\": \"旁路报警\",\"bypass\": \"旁路\",\"normal\": \"正常\",\"activity\": \"活动\",\"unknow\": \"未知\"}', '{\"EQUALS\": \"等于\"}', 'ENUM', '枚举', NULL, 1, 0, 15);
 
 
 -- 新增日志管理菜单(管理员使用功能)

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

@@ -88,21 +88,21 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         if(dataType == null){
             if(StringUtils.isNotEmpty(deviceType)){
                 //两种告警分类都包含的告警类型合并
-                if(String.valueOf(SensorType.INFRARED_SENSOR.getCode()).equals(deviceType)){
-                    deviceTypes.add("504");
+                if(String.valueOf(SensorType.INFRARED_SENSOR.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_Infrared");
                     deviceTypes.add(deviceType);
-                }else if(String.valueOf(SensorType.SMOKE_SENSOR.getCode()).equals(deviceType)){
-                    deviceTypes.add("503");
+                }else if(String.valueOf(SensorType.SMOKE_SENSOR.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_Smoke");
                     deviceTypes.add(deviceType);
-                }else if(String.valueOf(SensorType.HUMIDITY_TEMPERATURE_SENSOR.getCode()).equals(deviceType)){
-                    deviceTypes.add("501");
-                    deviceTypes.add("502");
+                }else if(String.valueOf(SensorType.HUMIDITY_TEMPERATURE_SENSOR.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_Humidity");
+                    deviceTypes.add("AlarmHostInput_Temperature");
                     deviceTypes.add(deviceType);
-                }else if(String.valueOf(SensorType.WATER_INTRUSION.getCode()).equals(deviceType)){
-                    deviceTypes.add("505");
+                }else if(String.valueOf(SensorType.WATER_INTRUSION.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_Soaking");
                     deviceTypes.add(deviceType);
-                }else if(String.valueOf(SensorType.DOOR_MAGNETIC_SENSOR.getCode()).equals(deviceType)){
-                    deviceTypes.add("506");
+                }else if(String.valueOf(SensorType.DOOR_MAGNETIC_SENSOR.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_DoorSensor");
                     deviceTypes.add(deviceType);
                 }else{
                     deviceTypes.add(deviceType);
@@ -111,17 +111,17 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         }else if(dataType == 2){
             //报警主机类：下拉框告警类型转换
             if(StringUtils.isNotEmpty(deviceType)){
-                if(String.valueOf(SensorType.INFRARED_SENSOR.getCode()).equals(deviceType)){
-                    deviceTypes.add("504");
-                }else if(String.valueOf(SensorType.SMOKE_SENSOR.getCode()).equals(deviceType)){
-                    deviceTypes.add("503");
-                }else if(String.valueOf(SensorType.HUMIDITY_TEMPERATURE_SENSOR.getCode()).equals(deviceType)){
-                    deviceTypes.add("501");
-                    deviceTypes.add("502");
-                }else if(String.valueOf(SensorType.WATER_INTRUSION.getCode()).equals(deviceType)){
-                    deviceTypes.add("505");
-                }else if(String.valueOf(SensorType.DOOR_MAGNETIC_SENSOR.getCode()).equals(deviceType)){
-                    deviceTypes.add("506");
+                if(String.valueOf(SensorType.INFRARED_SENSOR.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_Infrared");
+                }else if(String.valueOf(SensorType.SMOKE_SENSOR.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_Smoke");
+                }else if(String.valueOf(SensorType.HUMIDITY_TEMPERATURE_SENSOR.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_Humidity");
+                    deviceTypes.add("AlarmHostInput_Temperature");
+                }else if(String.valueOf(SensorType.WATER_INTRUSION.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_Soaking");
+                }else if(String.valueOf(SensorType.DOOR_MAGNETIC_SENSOR.getProductName()).equals(deviceType)){
+                    deviceTypes.add("AlarmHostInput_DoorSensor");
                 }else{
                     deviceTypes.add(deviceType);
                 }
@@ -303,13 +303,14 @@ public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, Iot
         List<AlarmTypeSelectedVO> list = Lists.newArrayList();
         AlarmTypeSelectedVO bean;
         String suffix = "告警";
-        List<String> excludeTypes = Lists.newArrayList("415","4186","41861","501","502","503","504","505","506");
+        List<String> excludeTypes = Lists.newArrayList("FSU_AirConditioner","FSU_DoPowerCollection","FSU_DoPowerControl",
+                "AlarmHostInput_Humidity","AlarmHostInput_Temperature","AlarmHostInput_Smoke","AlarmHostInput_Infrared","AlarmHostInput_Soaking","AlarmHostInput_DoorSensor");
         List<String> mixTypes = Lists.newArrayList(
-                String.valueOf(SensorType.INFRARED_SENSOR.getCode()),
-                String.valueOf(SensorType.SMOKE_SENSOR.getCode()),
-                String.valueOf(SensorType.HUMIDITY_TEMPERATURE_SENSOR.getCode()),
-                String.valueOf(SensorType.WATER_INTRUSION.getCode()),
-                String.valueOf(SensorType.DOOR_MAGNETIC_SENSOR.getCode())
+                String.valueOf(SensorType.INFRARED_SENSOR.getProductName()),
+                String.valueOf(SensorType.SMOKE_SENSOR.getProductName()),
+                String.valueOf(SensorType.HUMIDITY_TEMPERATURE_SENSOR.getProductName()),
+                String.valueOf(SensorType.WATER_INTRUSION.getProductName()),
+                String.valueOf(SensorType.DOOR_MAGNETIC_SENSOR.getProductName())
         );
         if(StringUtils.isEmpty(type)){
             List<AlarmTypeSelectedVO> types0=baseMapper.selectAlarmTypeList(excludeTypes,null,type);

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

@@ -204,13 +204,13 @@
         </foreach>
         <choose>
             <when test=" category == null or category =='' ">
-                and (source_type like '4%' or source_type like '5%')
+                and (source_type like 'FSU_%' or source_type like 'AlarmHostInput_%')
             </when>
             <when test=" category == '0' ">
-                and source_type like '4%'
+                and source_type like 'FSU_%'
             </when>
             <when test=" category == '2'">
-                and (source_type like '5%' or source_type in
+                and (source_type like 'AlarmHostInput_%' or source_type in
                 <foreach item="name" collection="mixTypes" separator="," open="(" close=")">
                     #{name}
                 </foreach>