diff --git a/dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/Constants.java b/dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/Constants.java index 0deb07a..29a89dd 100644 --- a/dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/Constants.java +++ b/dongjian-dashboard-back-common/src/main/java/com/dongjian/dashboard/back/common/Constants.java @@ -76,7 +76,7 @@ public class Constants { public static final List DEVICE_TYPE_TEMPERATURE_HUMIDITY = Arrays.asList(8888882L,9999992L); static { - CATEGORY_MAP.put(CATEGORY_ALARM, new ArrayList<>(List.of(1001L))); + CATEGORY_MAP.put(CATEGORY_ALARM, new ArrayList<>(List.of(1001L, 1011L))); CATEGORY_MAP.put(CATEGORY_MEASURE, new ArrayList<>(List.of(1003L))); diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml index 3674f3c..32bfed4 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/DeviceInfoMapperExt.xml @@ -63,7 +63,15 @@ #{deviceId} - and device_info.flag = 0 and (device_info.device_id LIKE '%\_85' or device_info.device_id LIKE '%\_85_9003' or device_info.device_id LIKE '%\_131_5') + and device_info.flag = 0 + and ( + device_info.device_id LIKE '%\\_85' + or device_info.device_id LIKE '%\\_85_9003' + or device_info.device_id LIKE '%\\_131_5' + + or type.device_category_id = 1011 + + ) and basic_monitoring_asset.flag != 1 and basic_space.flag != 1 and basic_floor.flag != 1 and basic_building.flag != 1 and type.device_category_id in @@ -507,7 +515,15 @@ #{companyId} - and device_info.flag = 0 and (device_info.device_id LIKE '%\_85' or device_info.device_id LIKE '%\_85_9003' or device_info.device_id LIKE '%\_131_5') + and device_info.flag = 0 + and ( + device_info.device_id LIKE '%\\_85' + or device_info.device_id LIKE '%\\_85_9003' + or device_info.device_id LIKE '%\\_131_5' + + or type.device_category_id = 1011 + + ) and basic_monitoring_asset.flag != 1 and basic_space.flag != 1 and basic_floor.flag != 1 and basic_building.flag != 1 and type.device_category_id in diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml index dfa346b..7293372 100644 --- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml +++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/FavoritedDeviceMapperExt.xml @@ -19,7 +19,14 @@ left join type ty on ty.id = dinfo.type_id WHERE dinfo.flag != 1 AND basic_monitoring_asset.flag != 1 - AND (dinfo.device_id LIKE '%\_85' or dinfo.device_id LIKE '%\_85_9003' or dinfo.device_id LIKE '%\_131_5') + AND ( + dinfo.device_id LIKE '%\\_85' + or dinfo.device_id LIKE '%\\_85_9003' + or dinfo.device_id LIKE '%\\_131_5' + + or ty.device_category_id = 1011 + + ) AND basic_space.flag != 1 AND basic_floor.flag != 1 AND basic_building.flag != 1 AND basic_building.building_id = #{buildingId}