From 00e38ff225eb948f5234934afc01aa54c94e0de6 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Sat, 10 Oct 2020 11:29:36 +0800
Subject: [PATCH] update
---
src/main/resources/mapper/DeviceMapper.xml | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index f62fd7a..6df8406 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -484,7 +484,7 @@
</select>
<select id="selectDevicesAll" parameterType="java.util.Map" resultType="com.moral.entity.Device">
- SELECT dev.id,dev.mac,dev.device_version_id deviceVersionId from device dev
+ SELECT dev.name,dev.address,dev.id,dev.state,dev.mac,dev.longitude,dev.latitude,dev.device_version_id deviceVersionId from device dev
left join monitor_point mpt on dev.monitor_point_id = mpt.id
<where>
<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
@@ -514,14 +514,39 @@
)
</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="getMacsByMonitorPointIds" resultType="java.lang.String">
+ select mac from device where monitor_point_id in
+ <foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
+ and is_delete=0
+ </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