From 4098ffa793c44984489972d904cbbf808e36a306 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 16 Dec 2024 15:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E7=9B=91=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/TemperatureMapper.xml            | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/mapper/xml/TemperatureMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/mapper/xml/TemperatureMapper.xml
index abb752c..9efbce1 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/mapper/xml/TemperatureMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/temperature/mapper/xml/TemperatureMapper.xml
@@ -20,21 +20,26 @@
             create_time
         FROM
             ${tableName}
-        WHERE
-            code = '867896071477072'
+        <where>
+            <if test="code != null and code != ''">
+                AND code = #{code}
+            </if>
+        </where>
         ORDER BY
             report_time DESC
             LIMIT 1
     </select>
 
     <select id="findList" resultType="org.jeecg.modules.temperature.entity.Temperature">
-        SELECT
+        SELECT code,
             max(room_temp) as roomTemp,
             DATE_FORMAT(report_time, '%H') reportHour,
             concat(DATE_FORMAT(now(), '%Y-%m-%d %H'),':00') reportTime
         FROM ${tableName}
         <where>
-            code = '867896071477072'
+            <if test="code != null and code != ''">
+                AND code = #{code}
+            </if>
             <if test="SDate != null and SDate != ''">
                 AND report_time >= #{SDate}
             </if>
@@ -42,8 +47,8 @@
                 AND report_time &lt;#{EDate}
             </if>
         </where>
-        group by reportTime,reportHour
-        ORDER BY reportTime asc
+        group by reportTime,reportHour,code
+        ORDER BY reportHour asc,code asc
     </select>
 
 </mapper>
\ No newline at end of file