From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa

---
 screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml |   99 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 87 insertions(+), 12 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
index 92659b3..9e3acd3 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,41 +28,104 @@
     </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">
         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
         FROM history_hourly_${timeUnits} h ,
         `device` AS d
-        WHERE d.mac = h.mac
-        AND d.mac IN
-        (SELECT mac FROM device WHERE 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>
-        )
+        <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>
 
     <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>
+
+    <select id="listResult" 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="mac != null and mac != ''">
+            and mac = #{mac}
+         </if>
+
+         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="mac != null and mac != ''">
+            and mac = #{mac}
+        </if>
+
+        and time like concat(#{time},'%')
+
+        order by time desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0