From 3a46aae0a8e9e4bd3cb8dcd1185a69a74668995b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 15 Dec 2020 14:08:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/resources/mapper/DeviceMapper.xml | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 59935ea..33cac0c 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -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}
@@ -565,4 +570,17 @@
<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>
+ <select id="getDevicesByAccountId" resultType="com.moral.entity.Device">
+ select d.* from monitor_point as m,device as d
+where d.monitor_point_id=m.id and d.monitor_point_id in
+(select m.id from organization as o,monitor_point as m where o.id = m.organization_id and o.id =
+(select o.id FROM account as a,organization as o where a.organization_id = o.id and a.id = #{id})) and d.is_delete !=1
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0