From bc1aabfb631b3bcd681760e288bacbbdd232c25d Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Wed, 9 Jul 2025 17:56:29 +0800
Subject: [PATCH] =?UTF-8?q?6732=20=E7=8E=AF=E5=A2=83=E7=9B=91=E6=B5=8B?=
 =?UTF-8?q?=E4=B8=AD=E6=97=A0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E2=80=9C=E6=AD=A3=E5=B8=B8=E2=80=9D=E7=8A=B6=E6=80=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kitchen/domain/KitchenDeviceSensorRecord.java    |  2 ++
 .../impl/KitchenDeviceSensorRecordServiceImpl.java   |  8 ++++++++
 .../kitchen/KitchenDeviceSensorRecordMapper.xml      | 12 ------------
 3 files changed, 10 insertions(+), 12 deletions(-)

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<KitchenDeviceSensorRecord> 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}
                 </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 ">