From 69c81b3b9651a6d0f51c30bde35e92e84a39c26b Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期日, 12 五月 2024 06:05:31 +0800 Subject: [PATCH] Merge pull request #1450 from BradyXs/master --- src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 8 ++++++-- web_src/src/components/dialog/platformEdit.vue | 14 +++++++++++--- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java index 794a0dc..e3a25ec 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java @@ -335,8 +335,12 @@ return; } String username = sdp.getOrigin().getUsername(); - String addressStr = sdp.getConnection().getAddress(); - + String addressStr; + if(StringUtils.isEmpty(platform.getSendStreamIp())){ + addressStr = sdp.getConnection().getAddress(); + }else { + addressStr = platform.getSendStreamIp(); + } Device device = null; // 閫氳繃 channel 鍜� gbStream 鏄惁涓簄ull 鍊煎垽鏂潵婧愭槸鐩存挱娴佸悎閫傚浗鏍� diff --git a/web_src/src/components/dialog/platformEdit.vue b/web_src/src/components/dialog/platformEdit.vue index 4c02dfc..06cb7c4 100755 --- a/web_src/src/components/dialog/platformEdit.vue +++ b/web_src/src/components/dialog/platformEdit.vue @@ -32,7 +32,14 @@ <el-input v-model="platform.deviceGBId" clearable @input="deviceGBIdChange"></el-input> </el-form-item> <el-form-item label="鏈湴IP" prop="deviceIp"> - <el-input v-model="platform.deviceIp" :disabled="true"></el-input> + <el-select v-model="platform.deviceIp" placeholder="璇烽�夋嫨涓庝笂绾х浉閫氱殑缃戝崱" style="width: 100%"> + <el-option + v-for="ip in deviceIp" + :key="ip" + :label="ip" + :value="ip"> + </el-option> + </el-select> </el-form-item> <el-form-item label="鏈湴绔彛" prop="devicePort"> <el-input v-model="platform.devicePort" :disabled="true" type="number"></el-input> @@ -165,6 +172,7 @@ administrativeDivision: "", sendStreamIp: null, }, + deviceIp: [], // 瀛樺偍鐢ㄦ埛閫夋嫨鐨勮澶嘔P rules: { name: [{ required: true, message: "璇疯緭鍏ュ钩鍙板悕绉�", trigger: "blur" }], serverGBId: [ @@ -198,7 +206,7 @@ console.log(res); if (res.data.code === 0) { that.platform.deviceGBId = res.data.data.username; - that.platform.deviceIp = res.data.data.deviceIp; + that.deviceIp = res.data.data.deviceIp.split(','); that.platform.devicePort = res.data.data.devicePort; that.platform.username = res.data.data.username; that.platform.password = res.data.data.password; @@ -222,7 +230,7 @@ this.platform.serverIP = platform.serverIP; this.platform.serverPort = platform.serverPort; this.platform.deviceGBId = platform.deviceGBId; - this.platform.deviceIp = platform.deviceIp; + this.deviceIp = platform.deviceIp.split(','); this.platform.devicePort = platform.devicePort; this.platform.username = platform.username; this.platform.password = platform.password; -- Gitblit v1.8.0