From 8942ab01127af3a6f99d8cbfb82869749f502d2e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 19 六月 2023 18:42:36 +0800
Subject: [PATCH] 优化国标级联的目录创建以及推送规则，优化接收目录规则，更加规范
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index f81d1f8..23333f7 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -447,7 +447,7 @@
List<DeviceChannel> getBusinessGroups(String deviceId, String typeCode);
@Select("select dc.id, dc.channelId, dc.deviceId, dc.name, dc.manufacture,dc.model,dc.owner, pc.civilCode,dc.block, " +
- " dc.address, '0' as parental,'0' as channelType, pc.id as parentId, dc.safetyWay, dc.registerWay,dc.certNum, dc.certifiable, " +
+ " dc.address, '0' as parental,'0' as channelType, pc.id as parentId, pc.businessGroupId as businessGroupId, dc.safetyWay, dc.registerWay,dc.certNum, dc.certifiable, " +
" dc.errCode,dc.endTime, dc.secrecy, dc.ipAddress, dc.port, dc.PTZType, dc.password, dc.status, " +
" dc.longitudeWgs84 as longitude, dc.latitudeWgs84 as latitude, pc.businessGroupId " +
" from device_channel dc" +
@@ -501,4 +501,14 @@
"</foreach>" +
"</script>"})
int batchOffline(List<DeviceChannel> channels);
+
+ @Select(value = {" <script>" +
+ "select * " +
+ "from device_channel " +
+ "where deviceId=#{deviceId}" +
+ " <if test='parentId != null '> and parentId = #{parentId} </if>" +
+ " <if test='parentId == null '> and parentId is null </if>" +
+ " <if test='onlyCatalog == true '> and parental = 1 </if>" +
+ " </script>"})
+ List<DeviceChannel> getSubChannelsByDeviceId(String deviceId, String parentId, boolean onlyCatalog);
}
--
Gitblit v1.8.0