From 7dc80d58f30dd7155d9e6b70f64db086e6473e33 Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 18 Aug 2023 12:08:41 +0800 Subject: [PATCH] fix:实测补偿修复 --- screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml | 76 +++++++++++++++++++++++++++++++++++++- 1 files changed, 74 insertions(+), 2 deletions(-) diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml index a392166..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 @@ -14,4 +26,64 @@ </foreach> and `time` = #{time} </select> + + <select id="queryLastHourlyMac" resultType="java.lang.String"> + SELECT `value` + FROM history_hourly_${timeUnits} + WHERE mac = #{mac} + AND `time` = #{time} + </select> + + + <select id="getArea" resultType="com.moral.api.pojo.dto.Wind.WindData"> + SELECT + d.longitude AS longitude, + d.latitude AS latitude, + CASE WHEN + h.value->'$.a01007' = 0 THEN 0.1 ELSE h.value->'$.a01007' END AS windSpeed, + h.value->'$.a01008' AS windDir + FROM history_hourly_${timeUnits} h , + `device` AS d + 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> + + + <select id="getPressureByMac" resultType="java.lang.String"> + 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> + + <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