From f5ae9718d4a210a86fca184cb3c76bd2ae811050 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 23 Dec 2024 18:39:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/gb28181/dao/CommonGBChannelMapper.java  |  6 ------
 .../gb28181/dao/provider/ChannelProvider.java   | 17 ++++-------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
index 0d61060f..507f8dd8 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
@@ -250,12 +250,6 @@ public interface CommonGBChannelMapper {
             "</script>"})
     void batchDelete(List<CommonGBChannel> channelListInDb);
 
-    @SelectProvider(type = ChannelProvider.class, method = "queryByStreamPushId")
-    CommonGBChannel queryByStreamPushId(@Param("streamPushId") Integer streamPushId);
-
-    @SelectProvider(type = ChannelProvider.class, method = "queryByStreamProxyId")
-    CommonGBChannel queryByStreamProxyId(@Param("streamProxyId") Integer streamProxyId);
-
     @SelectProvider(type = ChannelProvider.class, method = "queryListByCivilCode")
     List<CommonGBChannel> queryListByCivilCode(@Param("query") String query, @Param("online") Boolean online,
                                                @Param("channelType") Integer channelType, @Param("civilCode") String civilCode);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
index 16170d76..8997dcb6 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java
@@ -13,8 +13,8 @@ public class ChannelProvider {
     public final static String BASE_SQL = "select\n" +
             "    id as gb_id,\n" +
             "    device_db_id as gb_device_db_id,\n" +
-            "    stream_push_id,\n" +
-            "    stream_proxy_id,\n" +
+            "    data_type,\n" +
+            "    data_device_id,\n" +
             "    create_time,\n" +
             "    update_time,\n" +
             "    record_plan_id,\n" +
@@ -60,7 +60,7 @@ public class ChannelProvider {
             "    wdc.id as gb_id,\n" +
             "    wdc.device_db_id as gb_device_db_id,\n" +
             "    wdc.stream_push_id,\n" +
-            "    wdc.stream_proxy_id,\n" +
+            "    wdc.data_device_id,\n" +
             "    wdc.create_time,\n" +
             "    wdc.update_time,\n" +
             "    coalesce(wpgc.custom_device_id, wdc.gb_device_id, wdc.device_id) as gb_device_id,\n" +
@@ -109,19 +109,10 @@ public class ChannelProvider {
         return BASE_SQL + " where channel_type = 0 and id = #{gbId}";
     }
 
-    public String queryByStreamPushId(Map<String, Object> params ){
-        return BASE_SQL + " where channel_type = 0 and stream_push_id = #{streamPushId}";
-    }
-
     public String queryByDataId(Map<String, Object> params ){
-        return BASE_SQL + " where data_type = #{dataType} and data_device_id = #{dataDeviceId}";
+        return BASE_SQL + " where channel_type = 0 and data_type = #{dataType} and data_device_id = #{dataDeviceId}";
     }
 
-    public String queryByStreamProxyId(Map<String, Object> params ){
-        return BASE_SQL + " where channel_type = 0 and stream_proxy_id = #{streamProxyId}";
-    }
-
-
     public String queryListByCivilCode(Map<String, Object> params ){
         StringBuilder sqlBuild = new StringBuilder();
         sqlBuild.append(BASE_SQL);