From 625e780aae11e21143b281a610046698bd2133b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Fri, 18 Apr 2025 15:44:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E4=BD=93=E7=A7=AF=E6=B7=B7=E5=87=9D?=
 =?UTF-8?q?=E5=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/domain/CollectDeviceHisVo.java     | 10 ++++++++++
 .../screen.basic/MassConcreteMapper.xml       | 19 +++++++++++++++----
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/CollectDeviceHisVo.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/CollectDeviceHisVo.java
index 816a503..9cf6933 100644
--- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/CollectDeviceHisVo.java
+++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/domain/CollectDeviceHisVo.java
@@ -49,4 +49,14 @@ public class CollectDeviceHisVo {
      */
     private int limit;
 
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
 }
diff --git a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/MassConcreteMapper.xml b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/MassConcreteMapper.xml
index a720cc7..a6c42b3 100644
--- a/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/MassConcreteMapper.xml
+++ b/bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/MassConcreteMapper.xml
@@ -40,9 +40,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where tcdh.is_warn =1 and tcd.const_id = #{id}
     </select>
     <select id="temperatureList" resultType="com.bonus.base.screen.domain.CollectDeviceHisVo">
-        select tcdh.create_time as createTime,tcdh.remark as remark,tcd.dev_name as devName,tcdh.attr_val as attrVal
-        from tb_collect_device_his tcdh
-                 left join tb_collect_device tcd on tcdh.dev_id = tcd.id
-        where tcdh.is_warn =0 and tcd.id = #{id}
+        <choose>
+            <when test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                select tcdh.create_time as createTime,tcdh.remark as remark,tcd.dev_name as devName,tcdh.attr_val as attrVal
+                from tb_collect_device_his tcdh
+                left join tb_collect_device tcd on tcdh.dev_id = tcd.id
+                where tcdh.is_warn =0 and tcd.id = #{id}
+                and tcdh.create_time BETWEEN #{startTime} AND #{endTime}
+            </when>
+            <otherwise>
+                select tcdh.create_time as createTime,tcdh.remark as remark,tcd.dev_name as devName,tcdh.attr_val as attrVal
+                from tb_collect_device_his tcdh
+                left join tb_collect_device tcd on tcdh.dev_id = tcd.id
+                where tcdh.is_warn =0 and tcd.id = #{id} ORDER BY tcdh.create_time DESC limit 20
+            </otherwise>
+        </choose>
     </select>
 </mapper>