From c04171420e9522422d110acc165bd8c608c592fb Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 09 Oct 2020 13:20:41 +0800
Subject: [PATCH] 优化响应速度,取消flag标记以及具体设备的mac。

---
 src/main/resources/mapper/DeviceMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 67c9412..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,9 +514,10 @@
 )
 	</select>
 
-    <select id="getDeviceListByMonitorPointIds" resultType="com.moral.entity.Device">
-        select * from device where monitor_point_id in
+    <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">

--
Gitblit v1.8.0