From 231582eb775708d11be93c2df823b9b8eb235352 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Fri, 5 Aug 2022 17:10:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8E=A8=E6=B5=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=8F=E7=BA=AC=E5=BA=A6=E7=9A=84=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../request/impl/InviteRequestProcessor.java | 3 --- .../message/notify/NotifyMessageHandler.java | 1 + .../src/components/dialog/pushStreamEdit.vue | 18 ++++++++++++++++++ 3 files changed, 19 insertions(+), 3 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 feab1090..e4b9e3ed 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 @@ -120,9 +120,6 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements // Invite Request消息实现，此消息一般为级联消息，上级给下级发送请求视频指令 try { Request request = evt.getRequest(); - SipURI sipUri = (SipURI) request.getRequestURI(); - //从subject读取channelId,不再从request-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 c546057e..c8be504c 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 @@ import org.springframework.stereotype.Component; /** * 命令类型： 通知命令 * 命令类型： 状态信息(心跳)报送, 报警通知, 媒体通知, 移动设备位置数据，语音广播通知(TODO), 设备预置位(TODO) + * @author lin */ @Component public class NotifyMessageHandler extends MessageHandlerAbstract implements InitializingBean { diff --git a/web_src/src/components/dialog/pushStreamEdit.vue b/web_src/src/components/dialog/pushStreamEdit.vue index 590cb007..bad50779 100644 --- a/web_src/src/components/dialog/pushStreamEdit.vue +++ b/web_src/src/components/dialog/pushStreamEdit.vue @@ -23,6 +23,12 @@ + + + + + +
保存 @@ -68,6 +74,8 @@ export default { app: null, stream: null, gbId: null, + longitude: null, + latitude: null, }, rules: { name: [{ required: true, message: "请输入名称", trigger: "blur" }], @@ -84,6 +92,16 @@ export default { 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 () { From d94ceb4fedc3e0421f87e8d3f2d964d95573236b Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Fri, 5 Aug 2022 17:20:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=82=B9=E6=92=AD?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8F=8Cloading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/channelList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index bea4b39e..f232911c 100644 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -32,7 +32,7 @@
- + From 3adc81764c8c793b25cc9bc71d7037dcb48caf59 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Fri, 5 Aug 2022 17:27:18 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web_src/src/components/dialog/addUser.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_src/src/components/dialog/addUser.vue b/web_src/src/components/dialog/addUser.vue index 403ecebe..612c1e55 100644 --- a/web_src/src/components/dialog/addUser.vue +++ b/web_src/src/components/dialog/addUser.vue @@ -14,8 +14,8 @@ - - + +