yangjun
/
grgw_java_2025
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
曹磊 2025-09-19 17:43:10 +08:00
parent e00043c5dc 980f7be5a0
commit a415d87011
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/entity/Heatsource.java
View File

@ -129,7 +129,7 @@ public class Heatsource implements Serializable {
@TableLogic @TableLogic
private String delFlag; // 删除标识 private String delFlag; // 删除标识
/**创建人*/ /**创建人*/
private String createBy; private String createBy;
/**创建人*/ /**创建人*/
private String filePath; private String filePath;
/**创建时间*/ /**创建时间*/

13
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/heating/mapper/xml/HeatanalysisMapper.xml
View File

@ -559,21 +559,12 @@
<select id="getStaticNowList" resultType="org.jeecg.modules.heating.entity.Heatanalysis"> <select id="getStaticNowList" resultType="org.jeecg.modules.heating.entity.Heatanalysis">
SELECT t1.* SELECT t1.*
FROM bl_heatanalysis_${params.startTime} 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() WHERE DATE(t1.datatime) = CURRENT_DATE()
AND t1.view002 = #{params.sourceId} AND t1.view002 = #{params.sourceId}
AND t1.view004 IS NULL AND t1.view004 IS NULL
ORDER BY t1.datatime ORDER BY t1.datatime
limit 24
</select> </select>
<select id="yunweiPage" resultType="org.jeecg.modules.heating.entity.Heatanalysis"> <select id="yunweiPage" resultType="org.jeecg.modules.heating.entity.Heatanalysis">