From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev
---
screen-api/src/main/resources/mapper/DeviceMapper.xml | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 39de26e..12d7c7b 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -251,13 +251,16 @@
FROM
device as d
inner JOIN organization o on o.id = d.organization_id and o.is_delete = 0
+ <if test="monitorId !=null and monitorId !=''">
+ and monitor_point_id =#{monitorId}
+ </if>
<if test="organizationIds != null and organizationIds.size !=0">
and organization_id in
<foreach collection="organizationIds" item="id" index="index" open="(" close=")" separator=",">
#{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>
@@ -268,4 +271,30 @@
d.is_delete = 0
order by d.mac
</select>
+
+
+ <select id="getPage" resultType="com.moral.api.vo.OnlineRateVo">
+ select d.name,d.state,d.mac from device as d where organization_id=#{organizationId}
+ </select>
+
+
+ <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