From 53217a560fecddcf8ff5b7583532f49381b14d80 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Mon, 24 Aug 2020 08:38:30 +0800
Subject: [PATCH] 风场图update

---
 src/main/resources/mapper/DeviceMapper.xml |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index f62fd7a..a4412cf 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -524,4 +524,28 @@
 			FROM device
 			WHERE mac = #{mac}
 	</select>
+    <select id="getDeviceByCode" resultType="java.util.List" resultMap="BaseResultMap">
+        select d.* from monitor_point as m,device as d where m.id=d.monitor_point_id
+        and m.id
+        in
+        (SELECT m.id where state!=4
+        <if test="areaCode != null">
+            and area_code = #{areaCode}
+        </if>
+        <if test="townCode != null">
+            and town_code = #{townCode}
+        </if>
+
+
+        )
+    </select>
+    <select id="byMacGetDeviceAndWind" resultType="com.moral.entity.DeviceAndWind">
+         select d.longitude as longitude,d.latitude as latitude,
+            case when h.json->"$.e18[0]"=0 then 0.1 else h.json->"$.e18[0]" end
+            as windSpeed, h.json->"$.e23[0]" as windDir,
+            h.json->"$.e17[0]" as tVoc
+            from ${table} as h ,`device` as d
+            where d.mac=h.mac and h.time=#{time}
+			and d.mac=#{mac}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0