diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java index 107e60b..26d3aed 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java @@ -116,4 +116,6 @@ public class KitchenDeviceSensorRecord extends BaseEntity { private LocalDateTime endDateTime; private String searchValue; + + private Integer onlyWarn; } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java index eec84a7..6f54ea0 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java @@ -50,6 +50,14 @@ public class KitchenDeviceSensorRecordServiceImpl implements IKitchenDeviceSenso throw new ServiceException("设备分类不能为空"); } kitchenDeviceSensorRecord.setDeviceTypes(DeviceClassEnum.getDeviceTypesByKey(kitchenDeviceSensorRecord.getDeviceCategory())); + if(Objects.nonNull(kitchenDeviceSensorRecord.getOnlyWarn())) { + kitchenDeviceSensorRecord.setEnvSensorResultTypeList(CollUtil.newArrayList( + DeviceSensorResultEnum.TEMPERATURE_HIGH.getKey(), + DeviceSensorResultEnum.TEMPERATURE_LOW.getKey(), + DeviceSensorResultEnum.HUMIDITY_HIGH.getKey(), + DeviceSensorResultEnum.HUMIDITY_LOW.getKey(), + DeviceSensorResultEnum.SMOKE_HIGH.getKey())); + } List kitchenDeviceSensorRecordList = kitchenDeviceSensorRecordMapper .selectKitchenDeviceSensorRecordList(kitchenDeviceSensorRecord); if(CollUtil.isNotEmpty(kitchenDeviceSensorRecordList)) { diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml index dc5ae68..39faa0d 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml @@ -57,18 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deviceType} - - AND !((kdsm.measure_code = 'temperature' - and kdsm.measure_type = 1 - and kdsr.measure_data between kdsm.measure_min_value and kdsm.measure_max_value) - or (kdsm.measure_code = 'humidity' - and kdsm.measure_type = 1 - and kdsr.measure_data between kdsm.measure_min_value and kdsm.measure_max_value) - or (kdsm.measure_code = 'smoke' - and kdsm.measure_type = 1 - and kdsr.measure_data kdsm.measure_max_value) - ) - and (