bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

6732 环境监测中无筛选条件时“正常”状态数据未展示

This commit is contained in:
gaowdong 2025-07-09 17:56:29 +08:00
parent e3fee8da6d
commit bc1aabfb63
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/domain/KitchenDeviceSensorRecord.java
View File

@ -116,4 +116,6 @@ public class KitchenDeviceSensorRecord extends BaseEntity {
private LocalDateTime endDateTime;
private String searchValue;
private Integer onlyWarn;
}

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/kitchen/service/impl/KitchenDeviceSensorRecordServiceImpl.java
View File

@ -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<KitchenDeviceSensorRecord> kitchenDeviceSensorRecordList = kitchenDeviceSensorRecordMapper
.selectKitchenDeviceSensorRecordList(kitchenDeviceSensorRecord);
if(CollUtil.isNotEmpty(kitchenDeviceSensorRecordList)) {

12
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/kitchen/KitchenDeviceSensorRecordMapper.xml
View File

@ -57,18 +57,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{deviceType}
</foreach>
</if>
<if test="envSensorResultTypeList == null or envSensorResultTypeList.size() == 0">
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 <![CDATA[ <= ]]> kdsm.measure_max_value)
)
</if>
<if test="envSensorResultTypeList != null and envSensorResultTypeList.size() > 0">
and (
<foreach item="type" collection="envSensorResultTypeList" separator=" or ">