From c2fb892f2a553783787f1f76e3c26a37b2400cd0 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 30 Dec 2024 16:39:48 +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=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/genersoft/iot/vmp/streamPush/dao/StreamPushMapper.java | 2 +-
 .../iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java | 3 +--
 2 files changed, 2 insertions(+), 3 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 a92194d7..882eb89b 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
@@ -82,7 +82,7 @@ public interface StreamPushMapper {
     @Update("UPDATE wvp_stream_push " +
             "SET pushing=#{pushing}, server_id=#{serverId} " +
             "WHERE id=#{id}")
-    int updatePushStatus(@Param("id") int id, @Param("pushing") boolean pushing);
+    int updatePushStatus(@Param("id") int id, @Param("pushing") boolean pushing, @Param("serverId") String serverId);
 
     @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/impl/StreamPushServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
index 7932c669..972fc016 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
@@ -505,8 +505,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
             streamPush.setGbStatus(pushIng?"ON":"OFF");
         }
         streamPush.setPushTime(DateUtil.getNow());
-        streamPush.setServerId(userSetting.getServerId());
-        streamPushMapper.updatePushStatus(streamPush.getId(), pushIng);
+        streamPushMapper.updatePushStatus(streamPush.getId(), pushIng, userSetting.getServerId());
         if (ObjectUtils.isEmpty(streamPush.getGbDeviceId())) {
             return;
         }