From b97db305eb110da024e2e5c922e31f8665d65520 Mon Sep 17 00:00:00 2001
From: luoshuyue <239937404@qq.com>
Date: 星期五, 25 二月 2022 15:04:47 +0800
Subject: [PATCH] 修复了拉流添加国标编码上级级联调取不到视频的bug
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 4 +---
1 files changed, 1 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 9de19df..6d9cd00 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
@@ -86,8 +86,6 @@
@Update(value = {"UPDATE device_channel SET streamId=#{streamId} WHERE deviceId=#{deviceId} AND channelId=#{channelId}"})
void startPlay(String deviceId, String channelId, String streamId);
-
-
@Select(value = {" <script>" +
"SELECT dc.channelId, "+
"dc.deviceId, " +
@@ -107,7 +105,7 @@
" <if test='online == false' > AND dc.status=0</if> " +
" <if test='hasSubChannel!= null and hasSubChannel == true' > AND dc2.channelId is not null</if> " +
" <if test='hasSubChannel!= null and hasSubChannel == false' > AND dc2.channelId is null</if> " +
- " <if test='catalogId == null ' > AND pgc.platformId is null AND pgc.catalogId is null</if> " +
+ " <if test='catalogId == null ' > AND ((pgc.platformId IS NULL AND pgc.catalogId IS NULL) or (pgc.platformId != #{platformId}))</if> " +
" <if test='catalogId != null ' > AND pgc.platformId =#{platformId} AND pgc.catalogId = #{catalogId}</if> " +
" ORDER BY dc.deviceId, dc.channelId ASC" +
" </script>"})
--
Gitblit v1.8.0