From c629685cd131f88b848b56ea210e1a8930810be4 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Tue, 31 Dec 2024 11:39:09 +0800
Subject: [PATCH] =?UTF-8?q?[RPC=20=E6=8B=89=E6=B5=81=E4=BB=A3=E7=90=86]=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=81=9C=E6=AD=A2=E6=98=AF=E8=AF=AF=E6=8A=A5?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/streamProxy/dao/StreamProxyMapper.java          | 4 ++--
 .../service/impl/StreamProxyPlayServiceImpl.java            | 1 +
 数据库/2.7.3/数据库统合-更新.sql                            | 6 +++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/streamProxy/dao/StreamProxyMapper.java b/src/main/java/com/genersoft/iot/vmp/streamProxy/dao/StreamProxyMapper.java
index f43f1096..4258458b 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamProxy/dao/StreamProxyMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamProxy/dao/StreamProxyMapper.java
@@ -13,10 +13,10 @@ public interface StreamProxyMapper {
 
     @Insert("INSERT INTO wvp_stream_proxy (type, app, stream,relates_media_server_id, src_url, " +
             "timeout, ffmpeg_cmd_key, rtsp_type, enable_audio, enable_mp4, enable, pulling, " +
-            "enable_remove_none_reader, enable_disable_none_reader, create_time) VALUES" +
+            "enable_remove_none_reader, enable_disable_none_reader, server_id, create_time) VALUES" +
             "(#{type}, #{app}, #{stream}, #{relatesMediaServerId}, #{srcUrl}, " +
             "#{timeout}, #{ffmpegCmdKey}, #{rtspType}, #{enableAudio}, #{enableMp4}, #{enable}, #{pulling}, " +
-            "#{enableRemoveNoneReader}, #{enableDisableNoneReader}, #{createTime} )")
+            "#{enableRemoveNoneReader}, #{enableDisableNoneReader}, #{serverId}, #{createTime} )")
     @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
     int add(StreamProxy streamProxyDto);
 
diff --git a/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
index b936d4b1..1f112c1a 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamProxy/service/impl/StreamProxyPlayServiceImpl.java
@@ -83,6 +83,7 @@ public class StreamProxyPlayServiceImpl implements IStreamProxyPlayService {
         }
         if (!userSetting.getServerId().equals(streamProxy.getServerId())) {
             redisRpcPlayService.stopProxy(streamProxy.getServerId(), streamProxy.getId());
+            return;
         }
         stopProxy(streamProxy);
     }
diff --git a/数据库/2.7.3/数据库统合-更新.sql b/数据库/2.7.3/数据库统合-更新.sql
index 2f560341..6f1309fe 100644
--- a/数据库/2.7.3/数据库统合-更新.sql
+++ b/数据库/2.7.3/数据库统合-更新.sql
@@ -3,4 +3,8 @@
 */
 alter table wvp_device add server_id character varying(50);
 alter table wvp_media_server add server_id character varying(50);
-alter table wvp_stream_proxy add server_id character varying(50);
\ No newline at end of file
+alter table wvp_stream_proxy add server_id character varying(50);
+
+update wvp_device set server_id = "你服务的ID";
+update wvp_media_server set server_id = "你服务的ID";
+update wvp_stream_proxy set server_id = "你服务的ID";
\ No newline at end of file