From d8310f6bc609440fa352c0e5a9436c7c78caa287 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 29 Nov 2021 11:09:48 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_job
---
src/main/resources/mapper/DeviceMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index f490465..6d0b4d4 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -58,8 +58,8 @@
<select id="selectWithOrgIdsByMac" parameterType="java.lang.String" resultMap="BaseResultWithOrgIdsMap">
select
<include refid="simple_Column_List" /> ,
- dvn.version as device_version_value,
- den.limit_val,
+ dvn.version as device_version_value,
+ den.limit_val,
mp.province_code,
mp.city_code,
mp.area_code,
@@ -74,7 +74,7 @@
where mac = #{mac,jdbcType=VARCHAR}
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
- select
+ select
<include refid="Base_Column_List" />
from device
where id = #{id,jdbcType=INTEGER}
@@ -254,8 +254,8 @@
FROM monitor_point mp, device d
WHERE mp.id = d.monitor_point_id
AND mp.organization_id IN
- <foreach collection="organizationIdList" index="index" item="organizationId" open="(" separator="," close=")">
- #{organizationId}
+ <foreach collection="organizationIdList" index="index" item="organizationId" open="(" separator="," close=")">
+ #{organizationId}
</foreach>
AND d.is_delete = '0';
</select>
@@ -278,7 +278,7 @@
</foreach>
AND d.is_delete = '0'
</select>
-
+
<select id="macAndOrganizationIdMap" resultType="java.util.LinkedHashMap">
select mac,organization_id as organizationId
FROM monitor_point m,device d
@@ -290,5 +290,41 @@
</foreach>
</select>
+ <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="getAllByMacList" resultType="java.util.Map">
+ select * from device
+ where mac in
+ <foreach item="item" collection="list" index="index" open="(" separator="," close=")">#{item}</foreach>
+ </select>
+
+ <select id="getOfflineDevice" resultType="java.util.Map">
+ SELECT name,mac
+ from device
+ WHERE state=4 and is_delete=0 and monitor_point_id in
+ (SELECT id FROM monitor_point WHERE city_code!=130900 or (city_code=130900 and organization_id in (60, 65, 159, 165, 166) and id!=56 and id!=83 and id!=84))
+ and mac not in (SELECT mac FROM special_device_config);
+ </select>
+
+ <select id="getOfflineDeviceOfDiseaseCenter" resultType="java.util.Map">
+ SELECT name,mac
+ FROM `device`
+ WHERE state=4 and is_delete=0
+ and monitor_point_id in(
+ SELECT id FROM monitor_point WHERE organization_id=#{orgId}
+ );
+ </select>
+
+ <select id="getAllDeviceByOrg" resultType="java.util.Map">
+ SELECT name,mac
+ FROM `device`
+ WHERE is_delete=0
+ and monitor_point_id in(
+ SELECT id FROM monitor_point WHERE organization_id=#{orgId}
+ );
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0