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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-07-03 13:01:04 +08:00
parent 18636f3260 a768c9df40
commit 5ba2bc90c7
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,18 @@ 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 ">