From 30d07fbe902f3013a65a7c00fa141b119610a8f7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 22 Sep 2020 08:34:54 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2
---
src/main/resources/mapper/DeviceMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 67c9412..d0700b9 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -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