From 11dc24b3492b034a4c40e122d08b3ceeeaa57cb6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 24 Aug 2020 16:32:56 +0800
Subject: [PATCH] 根据城市名，获取sh_area表中经纬度并显示
---
src/main/resources/mapper/DeviceMapper.xml | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index f95d41f..a4412cf 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -385,9 +385,9 @@
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} h ,`device` as d
+ from ${table} as h ,`device` as d
where d.mac=h.mac and h.time=#{time}
- and d.mac in (select d.mac from device , monitor_point as m where d.monitor_point_id=m.id and m.id=#{id})
+ and d.mac in (select d.mac from device , monitor_point as m where d.monitor_point_id=m.id and m.id=#{id})
</select>
<select id="getDevicesStateByRegion" resultType="map">
@@ -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