From c507709690fadbd5aca01583947facfd504ac643 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Tue, 4 Nov 2025 21:38:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=AE=E5=BD=95=E8=AE=A2?=
 =?UTF-8?q?=E9=98=85=E9=80=9A=E9=81=93=E5=88=A0=E9=99=A4=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=A4=9Awvp=E9=89=B4=E6=9D=83=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=B8=8D=E5=85=B1=E7=94=A8=E5=AF=BC=E8=87=B4=E9=89=B4=E6=9D=83?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java | 1 +
 .../iot/vmp/gb28181/dao/CommonGBChannelMapper.java        | 5 ++---
 .../iot/vmp/gb28181/dao/DeviceChannelMapper.java          | 2 +-
 .../vmp/gb28181/service/impl/GbChannelServiceImpl.java    | 4 +++-
 .../iot/vmp/storager/impl/RedisCatchStorageImpl.java      | 8 ++++----
 .../iot/vmp/streamPush/bean/RedisPushStreamMessage.java   | 1 +
 web/src/views/common/CommonChannelEdit.vue                | 2 +-
 web/src/views/streamProxy/edit.vue                        | 3 ++-
 web/src/views/streamPush/buildPushStreamUrl.vue           | 2 +-
 web/src/views/streamPush/edit.vue                         | 5 +++--
 web/src/views/streamPush/index.vue                        | 8 +++++++-
 11 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
index 6089900a7..1ba09b540 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceChannel.java
@@ -247,6 +247,7 @@ public class DeviceChannel extends CommonGBChannel {
 		Element deviceElement = element.element("DeviceID");
 		DeviceChannel deviceChannel = new DeviceChannel();
 		deviceChannel.setDeviceId(deviceElement.getText());
+		deviceChannel.setDataType(ChannelDataType.GB28181);
 		return deviceChannel;
 	}
 
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 e6e7b1ac7..cd690c9ef 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
@@ -432,7 +432,7 @@ public interface CommonGBChannelMapper {
             ", gb_download_speed=#{item.gbDownloadSpeed}" +
             ", gb_svc_space_support_mod=#{item.gbSvcSpaceSupportMod}" +
             ", gb_svc_time_support_mode=#{item.gbSvcTimeSupportMode}" +
-            ", enable_broadcast = #{enableBroadcast}" +
+            ", enable_broadcast = #{item.enableBroadcast}" +
             " WHERE id=#{item.gbId}" +
             "</foreach>" +
             "</script>"})
@@ -593,7 +593,7 @@ public interface CommonGBChannelMapper {
     List<CommonGBChannel> queryOnlineListsByGbDeviceId(@Param("deviceId") int deviceId);
 
     @SelectProvider(type = ChannelProvider.class, method = "queryCommonChannelByDeviceChannel")
-    CommonGBChannel queryCommonChannelByDeviceChannel(DeviceChannel channel);
+    CommonGBChannel queryCommonChannelByDeviceChannel(@Param("dataType") Integer dataType, @Param("dataDeviceId") Integer dataDeviceId, @Param("deviceId") String deviceId);
 
     @Update("UPDATE wvp_device_channel SET stream_id = #{stream} where id = #{gbId}")
     void updateStream(int gbId, String stream);
@@ -696,5 +696,4 @@ public interface CommonGBChannelMapper {
     @SelectProvider(type = ChannelProvider.class, method = "queryListOutExtent")
     List<CommonGBChannel> queryListOutExtent(@Param("minLng") double minLng, @Param("maxLng") double maxLng,
                                             @Param("minLat") double minLat, @Param("maxLat") double maxLat);
-
 }
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java
index fcc6e66bd..e6d39a0b9 100755
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/DeviceChannelMapper.java
@@ -105,7 +105,7 @@ public interface DeviceChannelMapper {
     @Delete("DELETE FROM wvp_device_channel WHERE data_type =1 and data_device_id=#{dataDeviceId}")
     int cleanChannelsByDeviceId(@Param("dataDeviceId") int dataDeviceId);
 
-    @Delete("DELETE FROM wvp_device_channel WHERE WHERE data_type=#{dataType} and data_device_id=#{dataDeviceId} AND device_id=#{deviceId}")
+    @Delete("DELETE FROM wvp_device_channel WHERE data_type=#{dataType} and data_device_id=#{dataDeviceId} AND device_id=#{deviceId}")
     int deleteForNotify(DeviceChannel channel);
 
     @Select(value = {" <script>" +
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
index 05e371ada..ad60ecb9b 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/GbChannelServiceImpl.java
@@ -2,6 +2,7 @@ package com.genersoft.iot.vmp.gb28181.service.impl;
 
 import com.alibaba.excel.support.cglib.beans.BeanMap;
 import com.alibaba.excel.util.BeanMapUtils;
+import com.alibaba.fastjson2.JSON;
 import com.genersoft.iot.vmp.common.VideoManagerConstants;
 import com.genersoft.iot.vmp.common.enums.ChannelDataType;
 import com.genersoft.iot.vmp.conf.DynamicTask;
@@ -873,7 +874,8 @@ public class GbChannelServiceImpl implements IGbChannelService {
 
     @Override
     public CommonGBChannel queryCommonChannelByDeviceChannel(DeviceChannel channel) {
-        return commonGBChannelMapper.queryCommonChannelByDeviceChannel(channel);
+        System.out.println(JSON.toJSONString(channel));
+        return commonGBChannelMapper.queryCommonChannelByDeviceChannel(channel.getDataType(), channel.getDataDeviceId(), channel.getDeviceId());
     }
 
     @Override
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
index 27cff8f3e..d62584e7b 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/RedisCatchStorageImpl.java
@@ -212,21 +212,21 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
 
     @Override
     public void updateStreamAuthorityInfo(String app, String stream, StreamAuthorityInfo streamAuthorityInfo) {
-        String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY + userSetting.getServerId();
+        String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY;
         String objectKey = app+ "_" + stream;
         redisTemplate.opsForHash().put(key, objectKey, streamAuthorityInfo);
     }
 
     @Override
     public void removeStreamAuthorityInfo(String app, String stream) {
-        String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY + userSetting.getServerId();
+        String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY;
         String objectKey = app+ "_" + stream;
         redisTemplate.opsForHash().delete(key, objectKey);
     }
 
     @Override
     public StreamAuthorityInfo getStreamAuthorityInfo(String app, String stream) {
-        String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY + userSetting.getServerId();
+        String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY;
         String objectKey = app+ "_" + stream;
         return (StreamAuthorityInfo)redisTemplate.opsForHash().get(key, objectKey);
 
@@ -234,7 +234,7 @@ public class RedisCatchStorageImpl implements IRedisCatchStorage {
 
     @Override
     public List<StreamAuthorityInfo> getAllStreamAuthorityInfo() {
-        String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY + userSetting.getServerId();
+        String key = VideoManagerConstants.MEDIA_STREAM_AUTHORITY;
         List<StreamAuthorityInfo> result = new ArrayList<>();
         List<Object> values = redisTemplate.opsForHash().values(key);
         for (Object value : values) {
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/RedisPushStreamMessage.java b/src/main/java/com/genersoft/iot/vmp/streamPush/bean/RedisPushStreamMessage.java
index eb405a9a8..9ab9751e0 100644
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/bean/RedisPushStreamMessage.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/bean/RedisPushStreamMessage.java
@@ -32,6 +32,7 @@ public class RedisPushStreamMessage {
         push.setGbModel(model);
         push.setGbPtzType(ptzType);
         push.setGbStatus(status?"ON":"OFF");
+        push.setEnableBroadcast(0);
         return push;
     }
 }
diff --git a/web/src/views/common/CommonChannelEdit.vue b/web/src/views/common/CommonChannelEdit.vue
index d39a63273..19d15d239 100644
--- a/web/src/views/common/CommonChannelEdit.vue
+++ b/web/src/views/common/CommonChannelEdit.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="CommonChannelEdit" v-loading="loading" style="width: 100%; overflow: auto; height: calc(-148px + 100vh);">
+  <div id="CommonChannelEdit" v-loading="loading" style="width: 100%; height: calc(-218px + 100vh); overflow: auto;">
     <el-form ref="channelForm" :model="form" :rules="rules" status-icon label-width="160px" class="channel-form" size="medium">
       <div class="form-box">
         <el-form-item label="名称" prop="gbName">
diff --git a/web/src/views/streamProxy/edit.vue b/web/src/views/streamProxy/edit.vue
index 2b4ad5355..c40289ca2 100644
--- a/web/src/views/streamProxy/edit.vue
+++ b/web/src/views/streamProxy/edit.vue
@@ -6,7 +6,8 @@
       </div>
     </div>
     <el-tabs tab-position="top" style="padding-top: 1rem">
-      <el-tab-pane label="拉流代理信息" style="padding-top: 1rem">
+      <el-tab-pane label="拉流代理信息" style="padding-top: 1rem; height: calc(-218px + 100vh);
+    overflow: auto;">
         <el-form ref="streamProxy" :rules="rules" :model="streamProxy" label-width="140px" style="width: 50%; margin: 0 auto">
           <el-form-item label="类型" prop="type">
             <el-select
diff --git a/web/src/views/streamPush/buildPushStreamUrl.vue b/web/src/views/streamPush/buildPushStreamUrl.vue
index 650e47eef..49c36fc0b 100644
--- a/web/src/views/streamPush/buildPushStreamUrl.vue
+++ b/web/src/views/streamPush/buildPushStreamUrl.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="addUser" v-loading="isLoging">
+  <div id="buildPushStreamUrl">
     <el-dialog
       v-el-drag-dialog
       title="构建推流地址"
diff --git a/web/src/views/streamPush/edit.vue b/web/src/views/streamPush/edit.vue
index de8e98911..e7de658ab 100644
--- a/web/src/views/streamPush/edit.vue
+++ b/web/src/views/streamPush/edit.vue
@@ -5,8 +5,9 @@
         <el-page-header content="编辑推流信息" @back="close" />
       </div>
     </div>
-    <el-tabs tab-position="top" style="padding: 1rem 0">
-      <el-tab-pane label="推流信息编辑" style="background-color: #FFFFFF; padding: 1rem">
+    <el-tabs tab-position="top" style="padding-top: 1rem;">
+      <el-tab-pane label="推流信息编辑" style="background-color: #FFFFFF; padding: 1rem; height: calc(-218px + 100vh);
+    overflow: auto;">
         <el-divider content-position="center">基础信息</el-divider>
         <el-form ref="streamPushForm" v-loading="locading" status-icon label-width="160px" class="channel-form">
           <el-form-item label="应用名">
diff --git a/web/src/views/streamPush/index.vue b/web/src/views/streamPush/index.vue
index a8ccd0bf6..afbd60228 100755
--- a/web/src/views/streamPush/index.vue
+++ b/web/src/views/streamPush/index.vue
@@ -93,6 +93,12 @@
           </template>
         </el-table-column>
         <el-table-column prop="gbDeviceId" label="国标编码" min-width="200" />
+        <el-table-column label="国标状态" min-width="100">
+          <template v-slot:default="scope">
+            <el-tag v-if="scope.row.gbStatus === 'ON' " size="medium">在线</el-tag>
+            <el-tag v-if="scope.row.gbStatus !== 'ON' " size="medium" type="info">离线</el-tag>
+          </template>
+        </el-table-column>
         <el-table-column label="位置信息" min-width="150">
           <template v-slot:default="scope">
             <span v-if="scope.row.gbLongitude && scope.row.gbLatitude" size="medium">{{ scope.row.gbLongitude }}<br>{{ scope.row.gbLatitude }}</span>
@@ -137,7 +143,7 @@
     <devicePlayer ref="devicePlayer" />
     <addStreamTOGB ref="addStreamTOGB" />
     <importChannel ref="importChannel" />
-    <stream-push-edit v-if="streamPush" :stream-push="streamPush" :close-edit="closeEdit" style="height: calc(100vh - 90px);" />
+    <stream-push-edit v-if="streamPush" :stream-push="streamPush" :close-edit="closeEdit" />
     <buildPushStreamUrl ref="buildPushStreamUrl" />
   </div>
 </template>