From cdec9062c85f52d43e8d74e82cbcf9f8606ebb01 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 30 Jan 2024 16:39:59 +0800
Subject: [PATCH] chore:设备在线率接口提交
---
screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
index 61ab41c..1d339df 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>
@@ -122,4 +128,22 @@
order by time desc
</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