From 3d2a87f61dc46800fa065398e93e05cfceb3c796 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 30 Dec 2024 16:47:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8E=A8=E6=B5=81=E6=B5=81?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=B6=E5=86=99=E5=85=A5=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vmp/streamPush/dao/StreamPushMapper.java  |  4 ++--
 .../service/IStreamPushService.java           |  4 +---
 .../service/impl/StreamPushServiceImpl.java   | 22 +++++++++----------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java
index 882eb89b..c77fa419 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java
@@ -80,9 +80,9 @@ public interface StreamPushMapper {
     List<StreamPush> selectAllByMediaServerIdWithOutGbID(String mediaServerId);
 
     @Update("UPDATE wvp_stream_push " +
-            "SET pushing=#{pushing}, server_id=#{serverId} " +
+            "SET pushing=#{pushing}, server_id=#{serverId}, media_server_id=#{mediaServerId} " +
             "WHERE id=#{id}")
-    int updatePushStatus(@Param("id") int id, @Param("pushing") boolean pushing, @Param("serverId") String serverId);
+    int updatePushStatus(StreamPush streamPush);
 
     @Select("<script> "+
             "SELECT st.*, st.id as data_device_id, wdc.*, wdc.id as gb_id FROM wvp_stream_push st LEFT join wvp_device_channel wdc on wdc.data_type = 2 and st.id = wdc.data_device_id " +
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/service/IStreamPushService.java b/src/main/java/com/genersoft/iot/vmp/streamPush/service/IStreamPushService.java
index 56bde718..54143b38 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/service/IStreamPushService.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/service/IStreamPushService.java
@@ -88,11 +88,9 @@ public interface IStreamPushService {
 
     Map<String, StreamPush> getAllGBId();
 
-    void updateStatus(StreamPush push);
-
     void deleteByAppAndStream(String app, String stream);
 
-    void updatePushStatus(StreamPush streamPush, boolean pushIng);
+    void updatePushStatus(StreamPush streamPush);
 
     void batchUpdate(List<StreamPush> streamPushItemForUpdate);
 
diff --git a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
index 972fc016..1d8d2f0e 100755
--- a/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
@@ -93,7 +93,11 @@ public class StreamPushServiceImpl implements IStreamPushService {
             streamPush.setPushTime(DateUtil.getNow());
             add(streamPush);
         }else {
-            updatePushStatus(streamPushInDb, true);
+            streamPushInDb.setPushTime(DateUtil.getNow());
+            streamPushInDb.setPushing(true);
+            streamPushInDb.setServerId(userSetting.getServerId());
+            streamPushInDb.setMediaServerId(mediaInfo.getMediaServer().getId());
+            updatePushStatus(streamPushInDb);
         }
         // 冗余数据，自己系统中自用
         if (!"broadcast".equals(event.getApp()) && !"talk".equals(event.getApp())) {
@@ -144,7 +148,8 @@ public class StreamPushServiceImpl implements IStreamPushService {
             return;
         }
         if (streamPush.getGbDeviceId() != null) {
-            updatePushStatus(streamPush, false);
+            streamPush.setPushing(false);
+            updatePushStatus(streamPush);
         }else {
             deleteByAppAndStream(event.getApp(), event.getStream());
         }
@@ -492,20 +497,13 @@ public class StreamPushServiceImpl implements IStreamPushService {
         return streamPushMapper.getAllGBId();
     }
 
-    @Override
-    public void updateStatus(StreamPush push) {
-
-    }
-
     @Override
     @Transactional
-    public void updatePushStatus(StreamPush streamPush, boolean pushIng) {
-        streamPush.setPushing(pushIng);
+    public void updatePushStatus(StreamPush streamPush) {
         if (userSetting.getUsePushingAsStatus()) {
-            streamPush.setGbStatus(pushIng?"ON":"OFF");
+            streamPush.setGbStatus(streamPush.isPushing()?"ON":"OFF");
         }
-        streamPush.setPushTime(DateUtil.getNow());
-        streamPushMapper.updatePushStatus(streamPush.getId(), pushIng, userSetting.getServerId());
+        streamPushMapper.updatePushStatus(streamPush);
         if (ObjectUtils.isEmpty(streamPush.getGbDeviceId())) {
             return;
         }