From 36844dfeea0914de1138be9ebdf27c92d745d73a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 07 Mar 2024 15:58:54 +0800
Subject: [PATCH] fix:断线统计补充提交

---
 screen-api/src/main/resources/mapper/DeviceMapper.xml |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 996b601..570004a 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -274,7 +274,24 @@
         select d.name,d.state,d.mac from device as d where organization_id=#{organizationId}
     </select>
 
-    <select id="getList" resultType="com.moral.api.vo.OnlineRateVo">
-        select d.name,d.state,d.mac from device as d where organization_id=#{organizationId}
+
+    <select id="getLists" resultType="com.moral.api.vo.OnlineRateVo">
+        select d.name,d.state,d.mac from device as d where  is_delete=0
+        <if test="macs != null and macs.size !=0">
+            and mac in
+            <foreach collection="macs" item="mac" index="index" open="(" close=")" separator=",">
+                #{mac}
+            </foreach>
+        </if>
+        <if test="state !=null and state == 0" >
+            and  state=#{state}
+        </if>
+        <if test="state !=null and state != 0">
+            and  state<![CDATA[>=]]>#{state}
+        </if>
+    </select>
+
+    <select id="getListVo" resultType="com.moral.api.pojo.vo.device.DeviceVO">
+        select * from device  where monitor_point_id=#{monitorPointId} and is_delete=0
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0