From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 62 ++++++++++++++++++++++++++++--
1 files changed, 57 insertions(+), 5 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
index 42e5f83..3d978ce 100644
--- a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -38,7 +38,7 @@
<select id="getArea" resultType="com.moral.api.pojo.dto.Wind.WindData">
SELECT
d.longitude AS longitude,
- d.latitude AS latitude,
+ d.latitude AS latitude,d.mac,
CASE WHEN
h.value->'$.a01007' = 0 THEN 0.1 ELSE h.value->'$.a01007' END AS windSpeed,
h.value->'$.a01008' AS windDir
@@ -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>
@@ -99,12 +105,58 @@
<if test="mac != null and mac != ''">
and mac = #{mac}
</if>
- <if test="startDate!=null and startDate!='' ">
- and time BETWEEN #{startDate} and #{endDate}
+
+ and time BETWEEN #{startDate} and #{endDate}
+
+ order by time desc
+ </select>
+
+ <select id="listLikeResult" resultType="com.moral.api.entity.HistoryHourly">
+ SELECT mac,time,value,version FROM history_hourly${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="time!=null and time!='' ">
- and time =#{time} and limit 1
+ <if test="mac != null and mac != ''">
+ and mac = #{mac}
</if>
+
+ and time like concat(#{time},'%')
+
+ 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