From 33b9d2c203a9998272088ecdf43a15dd53669967 Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Thu, 28 Mar 2024 15:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 24526c4..64c99ba 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -257,7 +257,7 @@
#{id}
</foreach>
</if>
- inner JOIN device_map_hierarchy as dm on d.id = dm.device_id
+ left JOIN device_map_hierarchy as dm on d.id = dm.device_id
<if test="tableName !=null">
left join history_hourly${tableName} hd on hd.time = #{start} and d.mac = hd.mac
</if>
@@ -276,7 +276,13 @@
<select id="getLists" resultType="com.moral.api.vo.OnlineRateVo">
- select d.name,d.state,d.mac from device as d where organization_id=#{organizationId} and is_delete=0
+ 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>
@@ -284,4 +290,8 @@
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