From 3821dba14dbaa81a38172a626be0f44622bfc890 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Wed, 24 Jan 2024 10:54:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E9=80=9A=E9=81=93=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BA=91=E5=8F=B0=E7=B1=BB=E5=9E=8B=E5=92=8C=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=8A=B6=E6=80=81=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/service/impl/CommonGbChannelServiceImpl.java    | 2 +-
 .../genersoft/iot/vmp/storager/dao/CommonChannelMapper.java | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/CommonGbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/CommonGbChannelServiceImpl.java
index 2b8ad3ca..1b890276 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/CommonGbChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/CommonGbChannelServiceImpl.java
@@ -183,7 +183,7 @@ public class CommonGbChannelServiceImpl implements ICommonGbChannelService {
             ptzType = null;
         }
         List<CommonGbChannel> all = commonGbChannelMapper.queryChannelListInGroup(query, groupDeviceId,
-                regionDeviceId, inGroup, inRegion, type);
+                regionDeviceId, inGroup, inRegion, type, ptzType, online);
         return new PageInfo<>(all);
     }
 
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java
index df7fb884..12095141 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CommonChannelMapper.java
@@ -398,6 +398,8 @@ public interface CommonChannelMapper {
             "<if test='inRegion != null &amp; inRegion'> and common_gb_civilCode is not null </if>" +
             "<if test='inRegion != null &amp; !inRegion'> and common_gb_civilCode is null </if>" +
             "<if test='type != null'> and type = #{type} </if>" +
+            "<if test='online != null'> and common_gb_status = #{online} </if>" +
+            "<if test='ptzType != null'> and common_gb_ptz_type = #{ptzType} </if>" +
             "<if test='query != null'> and ( common_gb_device_id LIKE concat('%',#{query},'%') or common_gb_name LIKE concat('%',#{query},'%') )  </if>" +
             "</script>")
     List<CommonGbChannel> queryChannelListInGroup(@Param("query") String query,
@@ -405,7 +407,9 @@ public interface CommonChannelMapper {
                                                   @Param("regionDeviceId") String regionDeviceId,
                                                   @Param("inGroup") Boolean inGroup,
                                                   @Param("inRegion") Boolean inRegion,
-                                                  @Param("type") String type
+                                                  @Param("type") String type,
+                                                  @Param("ptzType") String ptzType,
+                                                  @Param("online") Boolean online
     );