From d48f89eee40c58b2f0b69aaf4d7fab469dc4657b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 24 七月 2023 09:04:47 +0800
Subject: [PATCH] 修复端口分配的并发问题
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 333a3af..bdc45bf 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
@@ -457,10 +457,10 @@
// 璁惧涓诲瓙鐮佹祦閫昏緫END
@Select(value = {" <script>" +
"select * " +
- "from device_channel " +
+ "from wvp_device_channel " +
"where device_id=#{deviceId}" +
- " <if test='parentId != null '> and parent_id = #{parentId} </if>" +
- " <if test='parentId == null '> and parent_id is null </if>" +
+ " <if test='parentId != null and parentId != deviceId'> and parent_id = #{parentId} </if>" +
+ " <if test='parentId == null or parentId == deviceId'> and parent_id is null or parent_id = #{deviceId}</if>" +
" <if test='onlyCatalog == true '> and parental = 1 </if>" +
" </script>"})
List<DeviceChannel> getSubChannelsByDeviceId(String deviceId, String parentId, boolean onlyCatalog);
--
Gitblit v1.8.0