From 28df05e261c0d63050d0bd938b7a6a2c2938b8e9 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期六, 06 八月 2022 09:42:28 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java | 3 ---
web_src/src/components/channelList.vue | 2 +-
web_src/src/components/dialog/addUser.vue | 4 ++--
web_src/src/components/dialog/pushStreamEdit.vue | 18 ++++++++++++++++++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java | 1 +
5 files changed, 22 insertions(+), 6 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 780c5f6..34cb753 100644
--- 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
@@ -124,9 +124,6 @@
// Invite Request娑堟伅瀹炵幇锛屾娑堟伅涓�鑸负绾ц仈娑堟伅锛屼笂绾х粰涓嬬骇鍙戦�佽姹傝棰戞寚浠�
try {
Request request = evt.getRequest();
- SipURI sipUri = (SipURI) request.getRequestURI();
- //浠巗ubject璇诲彇channelId,涓嶅啀浠巖equest-line璇诲彇銆� 鏈変簺骞冲彴request-line鏄钩鍙板浗鏍囩紪鐮侊紝涓嶆槸璁惧鍥芥爣缂栫爜銆�
- //String channelId = sipURI.getUser();
String channelId = SipUtils.getChannelIdFromRequest(request);
String requesterId = SipUtils.getUserIdFromFromHeader(request);
CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java
index c546057..c8be504 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java
@@ -9,6 +9,7 @@
/**
* 鍛戒护绫诲瀷锛� 閫氱煡鍛戒护
* 鍛戒护绫诲瀷锛� 鐘舵�佷俊鎭�(蹇冭烦)鎶ラ��, 鎶ヨ閫氱煡, 濯掍綋閫氱煡, 绉诲姩璁惧浣嶇疆鏁版嵁锛岃闊冲箍鎾�氱煡(TODO), 璁惧棰勭疆浣�(TODO)
+ * @author lin
*/
@Component
public class NotifyMessageHandler extends MessageHandlerAbstract implements InitializingBean {
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index bea4b39..f232911 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -32,7 +32,7 @@
<el-button v-if="!showTree" icon="iconfont icon-tree" circle size="mini" @click="switchTree()"></el-button>
</div>
</div>
- <devicePlayer ref="devicePlayer" v-loading="isLoging"></devicePlayer>
+ <devicePlayer ref="devicePlayer" ></devicePlayer>
<el-container v-loading="isLoging" style="height: 82vh;">
<el-aside width="auto" style="height: 82vh; background-color: #ffffff; overflow: auto" v-if="showTree" >
<DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent" ></DeviceTree>
diff --git a/web_src/src/components/dialog/addUser.vue b/web_src/src/components/dialog/addUser.vue
index 403eceb..612c1e5 100644
--- a/web_src/src/components/dialog/addUser.vue
+++ b/web_src/src/components/dialog/addUser.vue
@@ -14,8 +14,8 @@
<el-form-item label="鐢ㄦ埛鍚�" prop="username">
<el-input v-model="username" autocomplete="off"></el-input>
</el-form-item>
- <el-form-item label="鐢ㄦ埛绫诲瀷" prop="roleId">
- <el-select v-model="roleId" placeholder="璇烽�夋嫨">
+ <el-form-item label="鐢ㄦ埛绫诲瀷" prop="roleId" >
+ <el-select v-model="roleId" placeholder="璇烽�夋嫨" style="width: 100%">
<el-option
v-for="item in options"
:key="item.id"
diff --git a/web_src/src/components/dialog/pushStreamEdit.vue b/web_src/src/components/dialog/pushStreamEdit.vue
index 590cb00..bad5077 100644
--- a/web_src/src/components/dialog/pushStreamEdit.vue
+++ b/web_src/src/components/dialog/pushStreamEdit.vue
@@ -23,6 +23,12 @@
<el-form-item label="鍥芥爣缂栫爜" prop="gbId">
<el-input v-model="proxyParam.gbId" placeholder="璁剧疆鍥芥爣缂栫爜鍙帹閫佸埌鍥芥爣" clearable></el-input>
</el-form-item>
+ <el-form-item label="缁忓害" prop="longitude" v-if="proxyParam.gbId">
+ <el-input v-model="proxyParam.longitude" placeholder="缁忓害" clearable></el-input>
+ </el-form-item>
+ <el-form-item label="绾害" prop="latitude" v-if="proxyParam.gbId">
+ <el-input v-model="proxyParam.latitude" placeholder="缁忓害" clearable></el-input>
+ </el-form-item>
<el-form-item>
<div style="float: right;">
<el-button type="primary" @click="onSubmit">淇濆瓨</el-button>
@@ -68,6 +74,8 @@
app: null,
stream: null,
gbId: null,
+ longitude: null,
+ latitude: null,
},
rules: {
name: [{ required: true, message: "璇疯緭鍏ュ悕绉�", trigger: "blur" }],
@@ -84,6 +92,16 @@
if (proxyParam != null) {
this.proxyParam = proxyParam;
this.edit = true
+ }else{
+ this.proxyParam= {
+ name: null,
+ app: null,
+ stream: null,
+ gbId: null,
+ longitude: null,
+ latitude: null,
+ }
+ this.edit = false
}
},
onSubmit: function () {
--
Gitblit v1.8.0