From ee8bb47024e9ef5a585a5f4d61d1ab236c9d4341 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Tue, 23 Apr 2024 15:05:33 +0800
Subject: [PATCH] fix：因子相关性比较均值
---
screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
index fbb6c7e..3d978ce 100644
--- a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -50,6 +50,12 @@
<foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
#{monitorPointId}
</foreach>
+ <if test="macs != null and macs.size!= 0">
+ and h.mac in
+ <foreach collection="macs" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
AND h.time = #{time}
</select>
@@ -122,4 +128,35 @@
order by time desc
</select>
+
+ <select id="listAvgResult" resultType="com.moral.api.pojo.vo.historyMonthly.HistoryResultVo">
+ select DATE_FORMAT(time,'%Y-%m-%d %H') time,${type}
+ FROM history_hourly${table} WHERE 1 =1 and
+ time <![CDATA[>=]]> #{startTime}
+ and time <![CDATA[<=]]> #{endTime}
+ and mac in
+ <foreach collection="macs" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ group by time
+ order by time
+ </select>
+
+ <select id="HistoryMinutelyQuery" resultType="com.moral.api.entity.HistoryMinutely">
+ SELECT mac,time,value,version FROM history_minutely${table}
+ WHERE 1 =1
+ <if test="macs != null and macs.size!=0">
+ and mac in
+ <foreach collection="macs" item="id" index="index" open="(" close=")" separator=",">
+ #{id}
+ </foreach>
+ </if>
+ <if test="mac != null and mac != ''">
+ and mac = #{mac}
+ </if>
+
+ and time BETWEEN #{startDate} and #{endDate}
+
+ order by time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0