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

@@ -124,9 +124,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);

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  {

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>

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-form-item label="用户类型" prop="roleId" >
-            <el-select v-model="roleId"   placeholder="请选择">
+            <el-select v-model="roleId"  placeholder="请选择" style="width: 100%">
               <el-option
                 v-for="item in options"
                 :key="item.id"

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 @@ 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 () {