From 874733fa2ce0487eb3b780a75669731c91d7a31b Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 31 Dec 2024 15:36:48 +0800 Subject: [PATCH] =?UTF-8?q?[RPC=20=E4=BA=91=E7=AB=AF=E5=BD=95=E5=83=8F]=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8D=E5=8A=A1ID=20=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CloudRecordServiceImpl.java | 1 + .../dao/CloudRecordServiceMapper.java | 2 ++ web_src/src/components/CloudRecord.vue | 5 ++-- web_src/src/components/DeviceList.vue | 9 +++++--- web_src/src/components/StreamProxyList.vue | 14 +++++++---- web_src/src/components/StreamPushList.vue | 12 ++++++---- web_src/src/main.js | 23 +++++++++++-------- 7 files changed, 41 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java index 6f1ed436..5523bd3c 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/CloudRecordServiceImpl.java @@ -116,6 +116,7 @@ public class CloudRecordServiceImpl implements ICloudRecordService { @EventListener public void onApplicationEvent(MediaRecordMp4Event event) { CloudRecordItem cloudRecordItem = CloudRecordItem.getInstance(event); + cloudRecordItem.setServerId(userSetting.getServerId()); if (ObjectUtils.isEmpty(cloudRecordItem.getCallId())) { StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(event.getApp(), event.getStream()); if (streamAuthorityInfo != null) { diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java index b0c90fd0..f41c2e10 100644 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/CloudRecordServiceMapper.java @@ -21,6 +21,7 @@ public interface CloudRecordServiceMapper { " folder," + " file_path," + " file_size," + + " server_id," + " time_len ) " + "VALUES (" + " #{app}," + @@ -33,6 +34,7 @@ public interface CloudRecordServiceMapper { " #{folder}," + " #{filePath}," + " #{fileSize}," + + " #{serverId}," + " #{timeLen})" + " ") int add(CloudRecordItem cloudRecordItem); diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue index 0e627228..2f4feed5 100755 --- a/web_src/src/components/CloudRecord.vue +++ b/web_src/src/components/CloudRecord.vue @@ -65,8 +65,8 @@ @@ -135,7 +135,6 @@ export default { mediaServerPath: null, // 媒体服务地址 recordList: [], // 设备列表 chooseRecord: null, // 媒体服务 - serverId: this.$myServerId, updateLooper: 0, //数据刷新轮训标志 winHeight: window.innerHeight - 250, currentPage: 1, diff --git a/web_src/src/components/DeviceList.vue b/web_src/src/components/DeviceList.vue index bd5222e8..fc2fa81c 100755 --- a/web_src/src/components/DeviceList.vue +++ b/web_src/src/components/DeviceList.vue @@ -56,8 +56,8 @@ @@ -122,6 +122,7 @@ import uiHeader from '../layout/UiHeader.vue' import deviceEdit from './dialog/deviceEdit.vue' import syncChannelProgress from './dialog/SyncChannelProgress.vue' import configInfo from "./dialog/configInfo.vue"; +import Vue from "vue"; export default { name: 'app', @@ -144,11 +145,13 @@ export default { currentPage: 1, count: 15, total: 0, - serverId: this.$myServerId, getDeviceListLoading: false, }; }, computed: { + Vue() { + return Vue + }, getcurrentDeviceChannels: function () { let data = this.currentDevice['channelMap']; let channels = null; diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue index 8160b15c..cef5afde 100755 --- a/web_src/src/components/StreamProxyList.vue +++ b/web_src/src/components/StreamProxyList.vue @@ -58,8 +58,8 @@ @@ -67,8 +67,8 @@ @@ -114,6 +114,8 @@ import uiHeader from '../layout/UiHeader.vue' import StreamProxyEdit from "./StreamProxyEdit"; import MediaServer from "./service/MediaServer"; + import Vue from "vue"; + export default { name: 'streamProxyList', components: { @@ -138,12 +140,14 @@ searchSrt: "", mediaServerId: "", pulling: "", - serverId: this.$myServerId, mediaServerObj: new MediaServer(), mediaServerList: [], }; }, computed: { + Vue() { + return Vue + }, }, mounted() { this.initData(); diff --git a/web_src/src/components/StreamPushList.vue b/web_src/src/components/StreamPushList.vue index a1a68d13..843d69f4 100755 --- a/web_src/src/components/StreamPushList.vue +++ b/web_src/src/components/StreamPushList.vue @@ -52,8 +52,8 @@ @@ -117,6 +117,7 @@ import importChannel from './dialog/importChannel.vue' import MediaServer from './service/MediaServer' import StreamPushEdit from "./StreamPushEdit"; import ChannelEdit from "./ChannelEdit.vue"; +import Vue from "vue"; export default { name: 'streamPushList', @@ -145,11 +146,14 @@ export default { mediaServerList: [], multipleSelection: [], loading: false, - serverId: this.$myServerId, streamPush: null, }; }, - computed: {}, + computed: { + Vue() { + return Vue + }, + }, mounted() { this.initData(); this.updateLooper = setInterval(this.getPushList, 2000); diff --git a/web_src/src/main.js b/web_src/src/main.js index 14a96008..05a16fd5 100755 --- a/web_src/src/main.js +++ b/web_src/src/main.js @@ -76,18 +76,21 @@ 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({ + beforeCreate: function () { + // 获取本平台的服务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)=> { + }); + }, router: router, render: h => h(App), }).$mount('#app')