From 9a3d7f190717a6e3af608ffa0d78c66b6bcc0e8a Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Thu, 10 Sep 2020 15:23:07 +0800
Subject: [PATCH] 因子对比
---
src/main/resources/mapper/DeviceMapper.xml | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 196e7ee..67c9412 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -385,11 +385,10 @@
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">
SELECT
@@ -515,14 +514,38 @@
)
</select>
- <select id="getDeviceListByMonitorPointIds" resultType="com.moral.entity.Device">
- select * from device where monitor_point_id in
- <foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
- </select>
+ <select id="getDeviceListByMonitorPointIds" resultType="com.moral.entity.Device">
+ select * from device where monitor_point_id in
+ <foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
+ </select>
- <select id="selectAllFieldByMac" resultType="java.util.Map">
+ <select id="selectAllFieldByMac" resultType="java.util.Map">
SELECT *
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