From 05fb76231a3ba1b07837a6610d3ec58a2bbe687b Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Thu, 3 Jul 2025 11:25:56 +0800
Subject: [PATCH] =?UTF-8?q?6682=20=E6=8A=A5=E8=AD=A6=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E9=9C=80=E8=A6=81=E5=B1=95=E7=A4=BA=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kitchen/KitchenDeviceSensorRecordMapper.xml      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 39faa0d..dc5ae68 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,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 ">