From 9d55c59a9e8cca81e984dc713564d1b551973172 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 24 Jun 2020 10:28:35 +0800
Subject: [PATCH] resolve Multiple Endpoints
---
src/main/resources/mapper/DeviceMapper.xml | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 68910e8..5c53568 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -216,7 +216,7 @@
</where>
</select>
<select id="selectByOrgIdAndMpId" resultMap="BaseResultMap">
- SELECT dev.*,dve.version as device_version_value from device dev
+ SELECT dev.*,dve.version as device_version_value,mpt.* from device dev
left join monitor_point mpt on dev.monitor_point_id = mpt.id
left join device_version dve on dev.device_version_id = dve.id
<where>
@@ -418,4 +418,27 @@
<select id="getLimitDataByDevice" resultType="String">
SELECT limit_val FROM view_device_density WHERE mac = #{mac}
</select>
+
+ <select id="getMacsByOrganizationId" resultType="string">
+ SELECT d.mac
+ FROM monitor_point mp, device d
+ WHERE mp.id = d.monitor_point_id
+ AND mp.organization_id IN
+ <foreach collection="organizationIdList" index="index" item="organizationId" open="(" separator="," close=")">
+ #{organizationId}
+ </foreach>
+ AND d.is_delete = '0'
+ </select>
+
+ <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>
+ <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}
+ </select>
+
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0