From 980f7be5a01e261370b6c0f6c085b9319ae29caa Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 19 Sep 2025 16:10:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/heating/entity/Heatsource.java    |  2 +-
 .../heating/mapper/xml/HeatanalysisMapper.xml       | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java
index 53dfca5..9e07233 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java
@@ -129,7 +129,7 @@ public class Heatsource implements Serializable {
 	@TableLogic
 	private String delFlag;		// 删除标识
 	/**创建人*/
-	private String createBy; 
+	private String createBy;
 	/**创建人*/
 	private String filePath;
 	/**创建时间*/
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml
index 6661878..911e64b 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml
@@ -555,21 +555,12 @@
     <select id="getStaticNowList" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
         SELECT t1.*
         FROM bl_heatanalysis_${params.startTime} t1
-        INNER JOIN (
-        SELECT
-        MIN(id) AS min_id
-        FROM bl_heatanalysis_${params.startTime}
-        WHERE DATE(datatime) = CURRENT_DATE()
-        AND view002 = #{params.sourceId}
-        AND view004 IS NULL
-        GROUP BY
-        DATE_FORMAT(datatime, '%Y-%m-%d %H'),
-        FLOOR(MINUTE(datatime)/5)
-        ) t2 ON t1.id = t2.min_id
+
         WHERE DATE(t1.datatime) = CURRENT_DATE()
         AND t1.view002 = #{params.sourceId}
         AND t1.view004 IS NULL
         ORDER BY t1.datatime
+        limit 24
     </select>
 
     <select id="yunweiPage" resultType="org.jeecg.modules.heating.entity.Heatanalysis">