From 785da6d5ef615856e9cc5c9a34932788e6076ccb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Mon, 30 Dec 2024 16:32:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=89=8D=E7=AB=AF=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=9C=8D=E5=8A=A1ID=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/streamPush/dao/StreamPushMapper.java   |  3 +--
 .../service/impl/StreamPushServiceImpl.java        |  3 +--
 web_src/src/components/DeviceList.vue              | 14 ++++----------
 web_src/src/components/StreamProxyList.vue         |  4 +++-
 web_src/src/components/StreamPushList.vue          |  4 +++-
 web_src/src/main.js                                | 11 +++++++++++
 6 files changed, 23 insertions(+), 16 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 dfdb34216..a92194d79 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,11 +80,10 @@ public interface StreamPushMapper {
     List<StreamPush> selectAllByMediaServerIdWithOutGbID(String mediaServerId);
 
     @Update("UPDATE wvp_stream_push " +
-            "SET pushing=#{pushing} " +
+            "SET pushing=#{pushing}, server_id=#{serverId} " +
             "WHERE id=#{id}")
     int updatePushStatus(@Param("id") int id, @Param("pushing") boolean pushing);
 
-
     @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 " +
             "where (st.app, st.stream) in (" +
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 35daca30d..7932c6691 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
@@ -497,8 +497,6 @@ public class StreamPushServiceImpl implements IStreamPushService {
 
     }
 
-
-
     @Override
     @Transactional
     public void updatePushStatus(StreamPush streamPush, boolean pushIng) {
@@ -507,6 +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);
         if (ObjectUtils.isEmpty(streamPush.getGbDeviceId())) {
             return;
diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue
index 62b184493..bd5222e81 100755
--- a/web_src/src/components/DeviceList.vue
+++ b/web_src/src/components/DeviceList.vue
@@ -15,7 +15,7 @@
         </el-select>
         <el-button icon="el-icon-plus" size="mini" style="margin-right: 1rem;" type="primary" @click="add">添加设备
         </el-button>
-        <el-button icon="el-icon-info" size="mini" style="margin-right: 1rem;" type="primary" @click="showInfo(true)">平台信息
+        <el-button icon="el-icon-info" size="mini" style="margin-right: 1rem;" type="primary" @click="showInfo()">平台信息
         </el-button>
         <el-button icon="el-icon-refresh-right" circle size="mini" :loading="getDeviceListLoading"
                    @click="getDeviceList()"></el-button>
@@ -144,7 +144,7 @@ export default {
       currentPage: 1,
       count: 15,
       total: 0,
-      serverId: null,
+      serverId: this.$myServerId,
       getDeviceListLoading: false,
     };
   },
@@ -173,8 +173,6 @@ export default {
     initData: function () {
       this.currentPage = 1;
       this.total= 0;
-      // 获取平台信息
-      this.showInfo(false)
       this.getDeviceList();
     },
     currentChange: function (val) {
@@ -337,18 +335,14 @@ export default {
 
       })
     },
-    showInfo: function (showConfigInfo){
-
+    showInfo: function (){
       this.$axios({
         method: 'get',
         url: `/api/server/system/configInfo`,
       }).then( (res)=> {
         if (res.data.code === 0) {
           this.serverId = res.data.data.addOn.serverId;
-          console.log(this.serverId);
-          if(showConfigInfo) {
-            this.$refs.configInfo.openDialog(res.data.data)
-          }
+          this.$refs.configInfo.openDialog(res.data.data)
         }
       }).catch( (error)=> {
       });
diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue
index 81b7008d4..d29620cb7 100755
--- a/web_src/src/components/StreamProxyList.vue
+++ b/web_src/src/components/StreamProxyList.vue
@@ -58,7 +58,8 @@
         <el-table-column label="拉流状态" min-width="120" >
           <template v-slot:default="scope">
             <div slot="reference" class="name-wrapper">
-              <el-tag size="medium" v-if="scope.row.pulling">正在拉流</el-tag>
+              <el-tag size="medium" v-if="scope.row.pulling && serverId !== scope.row.serverId" style="border-color: #ecf1af">正在拉流</el-tag>
+              <el-tag size="medium" v-if="scope.row.pulling && serverId === scope.row.serverId">正在拉流</el-tag>
               <el-tag size="medium" type="info" v-if="!scope.row.pulling">尚未拉流</el-tag>
             </div>
           </template>
@@ -136,6 +137,7 @@
         searchSrt: "",
         mediaServerId: "",
         pulling: "",
+        serverId: this.$myServerId,
         mediaServerObj: new MediaServer(),
         mediaServerList: [],
 			};
diff --git a/web_src/src/components/StreamPushList.vue b/web_src/src/components/StreamPushList.vue
index 230af4c68..a1a68d135 100755
--- a/web_src/src/components/StreamPushList.vue
+++ b/web_src/src/components/StreamPushList.vue
@@ -52,7 +52,8 @@
         </el-table-column>
         <el-table-column label="推流状态"  min-width="100">
           <template v-slot:default="scope">
-            <el-tag size="medium" v-if="scope.row.pushing">推流中</el-tag>
+            <el-tag size="medium" v-if="scope.row.pushing && serverId !== scope.row.serverId" style="border-color: #ecf1af">推流中</el-tag>
+            <el-tag size="medium" v-if="scope.row.pushing && serverId === scope.row.serverId">推流中</el-tag>
             <el-tag size="medium" type="info" v-if="!scope.row.pushing">已停止</el-tag>
           </template>
         </el-table-column>
@@ -144,6 +145,7 @@ export default {
       mediaServerList: [],
       multipleSelection: [],
       loading: false,
+      serverId: this.$myServerId,
       streamPush: null,
     };
   },
diff --git a/web_src/src/main.js b/web_src/src/main.js
index 6f7fc25c4..14a960081 100755
--- a/web_src/src/main.js
+++ b/web_src/src/main.js
@@ -76,6 +76,17 @@ axios.interceptors.request.use(
 Vue.prototype.$axios = axios;
 Vue.prototype.$cookies.config(60 * 30);
 
+// 获取本平台的服务ID
+axios({
+  method: 'get',
+  url: `/api/server/system/configInfo`,
+}).then( (res)=> {
+  if (res.data.code === 0) {
+    Vue.prototype.$myServerId = res.data.data.addOn.serverId;
+  }
+}).catch( (error)=> {
+});
+
 new Vue({
   router: router,
   render: h => h(App),