guzijian / wvp-GB28181-pro · Commits

Commit 231582eb775708d11be93c2df823b9b8eb235352

Authored by 648540858
1 parent 142efdd9

推流列表增加经纬度的添加

Inline Side-by-side
Showing 3 changed files with 19 additions and 3 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
  View file @231582e
@@ -120,9 +120,6 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements @@ -120,9 +120,6 @@ public class InviteRequestProcessor extends SIPRequestProcessorParent implements
120 // Invite Request消息实现，此消息一般为级联消息，上级给下级发送请求视频指令 120 // Invite Request消息实现，此消息一般为级联消息，上级给下级发送请求视频指令
121 try { 121 try {
122 Request request = evt.getRequest(); 122 Request request = evt.getRequest();
123 - SipURI sipUri = (SipURI) request.getRequestURI();  
124 - //从subject读取channelId,不再从request-line读取。 有些平台request-line是平台国标编码，不是设备国标编码。  
125 - //String channelId = sipURI.getUser();  
126 String channelId = SipUtils.getChannelIdFromRequest(request); 123 String channelId = SipUtils.getChannelIdFromRequest(request);
127 String requesterId = SipUtils.getUserIdFromFromHeader(request); 124 String requesterId = SipUtils.getUserIdFromFromHeader(request);
128 CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME); 125 CallIdHeader callIdHeader = (CallIdHeader) request.getHeader(CallIdHeader.NAME);
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/notify/NotifyMessageHandler.java
  View file @231582e
@@ -9,6 +9,7 @@ import org.springframework.stereotype.Component; @@ -9,6 +9,7 @@ import org.springframework.stereotype.Component;
9 /** 9 /**
10 * 命令类型： 通知命令 10 * 命令类型： 通知命令
11 * 命令类型： 状态信息(心跳)报送, 报警通知, 媒体通知, 移动设备位置数据，语音广播通知(TODO), 设备预置位(TODO) 11 * 命令类型： 状态信息(心跳)报送, 报警通知, 媒体通知, 移动设备位置数据，语音广播通知(TODO), 设备预置位(TODO)
  12 + * @author lin
12 */ 13 */
13 @Component 14 @Component
14 public class NotifyMessageHandler extends MessageHandlerAbstract implements InitializingBean { 15 public class NotifyMessageHandler extends MessageHandlerAbstract implements InitializingBean {
web_src/src/components/dialog/pushStreamEdit.vue
  View file @231582e
@@ -23,6 +23,12 @@ @@ -23,6 +23,12 @@
23 <el-form-item label="国标编码" prop="gbId"> 23 <el-form-item label="国标编码" prop="gbId">
24 <el-input v-model="proxyParam.gbId" placeholder="设置国标编码可推送到国标" clearable></el-input> 24 <el-input v-model="proxyParam.gbId" placeholder="设置国标编码可推送到国标" clearable></el-input>
25 </el-form-item> 25 </el-form-item>
  26 + <el-form-item label="经度" prop="longitude" v-if="proxyParam.gbId">
  27 + <el-input v-model="proxyParam.longitude" placeholder="经度" clearable></el-input>
  28 + </el-form-item>
  29 + <el-form-item label="纬度" prop="latitude" v-if="proxyParam.gbId">
  30 + <el-input v-model="proxyParam.latitude" placeholder="经度" clearable></el-input>
  31 + </el-form-item>
26 <el-form-item> 32 <el-form-item>
27 <div style="float: right;"> 33 <div style="float: right;">
28 <el-button type="primary" @click="onSubmit">保存</el-button> 34 <el-button type="primary" @click="onSubmit">保存</el-button>
@@ -68,6 +74,8 @@ export default { @@ -68,6 +74,8 @@ export default {
68 app: null, 74 app: null,
69 stream: null, 75 stream: null,
70 gbId: null, 76 gbId: null,
  77 + longitude: null,
  78 + latitude: null,
71 }, 79 },
72 rules: { 80 rules: {
73 name: [{ required: true, message: "请输入名称", trigger: "blur" }], 81 name: [{ required: true, message: "请输入名称", trigger: "blur" }],
@@ -84,6 +92,16 @@ export default { @@ -84,6 +92,16 @@ export default {
84 if (proxyParam != null) { 92 if (proxyParam != null) {
85 this.proxyParam = proxyParam; 93 this.proxyParam = proxyParam;
86 this.edit = true 94 this.edit = true
  95 + }else{
  96 + this.proxyParam= {
  97 + name: null,
  98 + app: null,
  99 + stream: null,
  100 + gbId: null,
  101 + longitude: null,
  102 + latitude: null,
  103 + }
  104 + this.edit = false
87 } 105 }
88 }, 106 },
89 onSubmit: function () { 107 onSubmit: function () {