From d620e65b30db7bc43db71d26fbce36548819eebc Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Tue, 28 Dec 2021 09:42:19 +0800
Subject: [PATCH] 修改特殊设备更新接口

---
 screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml |   38 +++++++++++++++++++++++++++++++-------
 1 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
index 90af3f8..426f142 100644
--- a/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
+++ b/screen-api/src/main/resources/mapper/HistoryHourlyMapper.xml
@@ -2,12 +2,36 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.moral.api.mapper.HistoryHourlyMapper">
 
-    <!-- ������������������������ -->
-    <resultMap id="BaseResultMap" type="com.moral.api.entity.HistoryHourly">
-        <result column="mac" property="mac"/>
-        <result column="time" property="time"/>
-        <result column="value" property="value"/>
-        <result column="version" property="version"/>
-    </resultMap>
+    <select id="selectHourlyData" resultType="java.lang.String">
+        SELECT `value` FROM history_hourly_${timeUnits} WHERE mac = #{mac} AND `time` = #{time}
+    </select>
+    
+    <select id="selectDataByMacsAndTime" parameterType="java.util.List" resultType="java.util.Map">
+        select mac, `time`, `value` from history_hourly_${timeUnits}
+        where mac in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        and `time` = #{time}
+    </select>
 
+    <select id="getSensorSumByMacs" resultType="java.lang.Double">
+        SELECT SUM(`value`->'$.${sensorCode}')
+        FROM history_hourly_${timeUnits}
+        WHERE `time` = #{time}
+        AND mac IN
+        <foreach collection="macs" item="mac" index="index" open="(" close=")" separator=",">
+            #{mac}
+        </foreach>
+    </select>
+
+    <select id="getSensorAvgByMacs" resultType="java.lang.Double">
+        SELECT AVG(`value`->'$.${sensorCode}')
+        FROM history_hourly_${timeUnits}
+        WHERE `time` = #{time}
+        AND mac IN
+        <foreach collection="macs" item="mac" index="index" open="(" close=")" separator=",">
+            #{mac}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0