From 636af927431b46a0788b7d76233387923135ac0c Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Tue, 01 Dec 2020 13:11:21 +0800
Subject: [PATCH] 数据空判断
---
src/main/resources/mapper/DeviceMapper.xml | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 84e4e42..cbdd370 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -378,7 +378,7 @@
as windSpeed, h.json->"$.e23[0]" as windDir,
h.json->"$.e17[0]" as tVoc
from ${table} h ,`device` as d
- where d.mac=h.mac and d.mac=#{mac} and h.time=#{time}
+ where d.mac=h.mac and d.mac=#{mac} and h.time=(select max(time) from ${table})
</select>
<select id="byMonitorIdGetDeviceAndWind" resultType="com.moral.entity.DeviceAndWind">
select d.longitude as longitude,d.latitude as latitude,
@@ -386,7 +386,7 @@
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}
+ where d.mac=h.mac and h.time=(select max(time) from ${table})
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>
@@ -457,8 +457,13 @@
<select id="getDeviceById1" resultType="com.moral.entity.Device">
SELECT d.* FROM `device` as d,monitor_point as mp,device_property as dp where d.monitor_point_id=mp.id and d.id=dp.id and dp.device_tech=1 and d.monitor_point_id=#{id}
</select>
- <select id="getDeviceById2" resultType="com.moral.entity.Device">
- SELECT d.* FROM `device` as d,monitor_point as mp,device_property as dp where d.monitor_point_id=mp.id and d.id=dp.id and dp.device_tech=2 and d.monitor_point_id=#{id}
+ <select id="getDeviceById2" resultType="com.moral.entity.Device">
+ SELECT d.*
+ FROM `device` as d,monitor_point as mp,device_property as dp
+ where d.monitor_point_id=mp.id
+ and d.id=dp.id
+ and dp.device_tech=2
+ and d.monitor_point_id=#{id}
</select>
<select id="getDeviceById3" resultType="com.moral.entity.Device">
SELECT d.* FROM `device` as d,monitor_point as mp,device_property as dp where d.monitor_point_id=mp.id and d.id=dp.id and dp.device_tech=3 and d.monitor_point_id=#{id}
@@ -547,7 +552,7 @@
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}
+ where d.mac=h.mac and h.time=(select max(time) from ${table})
and d.mac=#{mac}
</select>
<select id="getDeviceByCodeAndId" resultType="com.moral.entity.Device" resultMap="BaseResultMap">
@@ -565,4 +570,11 @@
<select id="getDevicesByMpId" resultType="java.util.Map">
select name,mac from device where monitor_point_id=#{mpId} and is_delete=0
</select>
+ <select id="getDevice" resultType="com.moral.entity.Device">
+ select * from device
+ where mac like concat('%',#{macOrName},'%')
+ </select>
+ <select id="getDeviceByCityCode" resultType="com.moral.entity.Device">
+ SELECT d.* FROM `monitor_point` mt,device d where d.monitor_point_id=mt.id and d.state!=4 and mt.city_code=130900
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0