From 68e22957db996437fa20a9a4aa5ff37c54d4056f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 27 Sep 2023 15:22:25 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 55 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 44 insertions(+), 11 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
index 2ef6b15..b707ec4 100644
--- a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -3,9 +3,21 @@
<mapper namespace="com.moral.api.mapper.HistoryHourlyMapper">
<select id="selectHourlyData" resultType="java.lang.String">
- SELECT `value` FROM history_hourly_${timeUnits} WHERE mac = #{mac} AND `time` = #{time}
+ SELECT `value`
+ FROM history_hourly_${timeUnits}
+ WHERE mac = #{mac}
+ AND `time` = #{time}
</select>
-
+
+
+ <select id="selectHourlyListData" parameterType="java.util.List" resultType="java.util.Map">
+ SELECT `value`,`time`
+ FROM history_hourly_${timeUnits}
+ WHERE mac = #{mac}
+ AND `time` BETWEEN #{startTime} and #{endTime}
+ </select>
+
+
<select id="selectDataByMacsAndTime" parameterType="java.util.List" resultType="java.util.Map">
select mac, `time`, `value` from history_hourly_${timeUnits}
where mac in
@@ -16,9 +28,11 @@
</select>
<select id="queryLastHourlyMac" resultType="java.lang.String">
- SELECT `value` FROM history_hourly_${timeUnits} WHERE mac = #{mac} AND `time` = #{time}
+ SELECT `value`
+ FROM history_hourly_${timeUnits}
+ WHERE mac = #{mac}
+ AND `time` = #{time}
</select>
-
<select id="getArea" resultType="com.moral.api.pojo.dto.Wind.WindData">
@@ -30,27 +44,46 @@
h.value->'$.a01008' AS windDir
FROM history_hourly_${timeUnits} h ,
`device` AS d
- WHERE d.mac = h.mac
- AND d.mac IN
- (SELECT mac FROM device WHERE is_delete = '0' and monitor_point_id IN
+ WHERE d.is_delete = '0'
+ and d.mac = h.mac
+ AND d.monitor_point_id IN
<foreach item="monitorPointId" collection="monitorPointIds" index="index" open="(" separator="," close=")">
#{monitorPointId}
</foreach>
- )
AND h.time = #{time}
</select>
<select id="getTVOCByMac" resultType="java.lang.String">
- select `value` ->'$.${sensor}' from history_hourly_${yearAndMonth} where mac=#{mac} and time=#{time}
+ select `value` - > '$.${sensor}'
+ from history_hourly_${yearAndMonth}
+ where mac = #{mac}
+ and time =#{time}
</select>
<select id="getPressureByMac" resultType="java.lang.String">
- select `value`->'$.a01006' from history_hourly_${yearAndMonth} where mac=#{mac} and time=#{time}
+ select `value` - > '$.a01006'
+ from history_hourly_${yearAndMonth}
+ where mac = #{mac}
+ and time =#{time}
</select>
<select id="getDataByMac" resultType="java.util.Map">
- select `value` from history_hourly_${yearAndMonth} where mac=#{mac} and time=#{time}
+ select `value`
+ from history_hourly_${yearAndMonth}
+ where mac = #{mac}
+ and time =#{time}
</select>
+
+ <insert id="insertHistoryHourly">
+ INSERT INTO history_hourly_${timeUnits}
+ VALUES (#{mac}, #{time}, #{value}, #{version})
+ </insert>
+
+
+ <insert id="updateHistoryHourly">
+ UPDATE history_hourly_${timeUnits} SET `value` = #{value}
+ where mac = #{mac} and time = #{time} and version = #{version}
+ </insert>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0