临时提交

src/main/java/com/genersoft/iot/vmp/gb28181/dao/provider/ChannelProvider.java

@@ -22,7 +22,7 @@ public class ChannelProvider {
                 "    coalesce(gb_manufacturer, manufacturer) as gb_manufacturer,\n" +
                 "    coalesce(gb_model, model) as gb_model,\n" +
                 "    coalesce(gb_owner, owner) as gb_owner,\n" +
-                "    coalesce(gb_civil_code, civil_code),\n" +
+                "    coalesce(gb_civil_code, civil_code) as gb_civil_code,\n" +
                 "    coalesce(gb_block, block) as gb_block,\n" +
                 "    coalesce(gb_address, address) as gb_address,\n" +
                 "    coalesce(gb_parental, parental) as gb_parental,\n" +

web_src/src/components/CloudRecord.vue

@@ -42,7 +42,7 @@
       </div>
     </div>
     <!--设备列表-->
-    <el-table :data="recordList" style="width: 100%" :height="winHeight">
+    <el-table size=mini :data="recordList" style="width: 100%" :height="winHeight">
       <el-table-column
         type="selection"
         width="55">

web_src/src/components/DeviceList.vue

@@ -22,7 +22,7 @@
       </div>
     </div>
     <!--设备列表-->
-    <el-table :data="deviceList" style="width: 100%;font-size: 12px;" :height="winHeight" header-row-class-name="table-header">
+    <el-table size=mini :data="deviceList" style="width: 100%;font-size: 12px;" :height="winHeight" header-row-class-name="table-header">
       <el-table-column prop="name" label="名称" min-width="160">
       </el-table-column>
       <el-table-column prop="deviceId" label="设备编号" min-width="200" >
@@ -67,7 +67,7 @@
 <!--      <el-table-column prop="createTime" label="创建时间"  width="140">-->
 <!--      </el-table-column>-->
 
-      <el-table-column label="操作" min-width="450" fixed="right">
+      <el-table-column label="操作" min-width="380" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" size="medium" v-bind:disabled="scope.row.online==0" icon="el-icon-refresh" @click="refDevice(scope.row)"
                      @mouseover="getTooltipContent(scope.row.deviceId)">刷新

web_src/src/components/PlatformEdit.vue

@@ -1,10 +1,10 @@
 <template>
-  <div id="StreamProxyEdit" style="width: 100%">
+  <div id="PlatformEdit" style="width: 100%">
     <div class="page-header">
       <div class="page-title">
         <el-button icon="el-icon-back" size="mini" style="font-size: 20px; color: #000;" type="text" @click="close" ></el-button>
         <el-divider direction="vertical"></el-divider>
-        编辑拉流代理信息
+        添加上级平台
       </div>
       <div class="page-header-btn">
         <div style="display: inline;">
@@ -12,30 +12,30 @@
         </div>
       </div>
     </div>
-    <div id="shared" style="text-align: right; margin-top: 1rem">
+    <div id="shared" style="text-align: right; margin-top: 1rem; background-color: #FFFFFF; padding-top: 2rem;">
       <el-row :gutter="24">
         <el-col :span="11">
-          <el-form ref="platform1" :rules="rules" :model="platform" label-width="160px">
+          <el-form ref="platform1" :rules="rules" :model="value" label-width="160px">
             <el-form-item label="名称" prop="name">
-              <el-input v-model="platform.name"></el-input>
+              <el-input v-model="value.name"></el-input>
             </el-form-item>
             <el-form-item label="SIP服务国标编码" prop="serverGBId">
-              <el-input v-model="platform.serverGBId" clearable @input="serverGBIdChange"></el-input>
+              <el-input v-model="value.serverGBId" clearable @input="serverGBIdChange"></el-input>
             </el-form-item>
             <el-form-item label="SIP服务国标域" prop="serverGBDomain">
-              <el-input v-model="platform.serverGBDomain" clearable></el-input>
+              <el-input v-model="value.serverGBDomain" clearable></el-input>
             </el-form-item>
             <el-form-item label="SIP服务IP" prop="serverIP">
-              <el-input v-model="platform.serverIP" clearable></el-input>
+              <el-input v-model="value.serverIP" clearable></el-input>
             </el-form-item>
             <el-form-item label="SIP服务端口" prop="serverPort">
-              <el-input v-model="platform.serverPort" clearable type="number"></el-input>
+              <el-input v-model="value.serverPort" clearable type="number"></el-input>
             </el-form-item>
             <el-form-item label="设备国标编号" prop="deviceGBId">
-              <el-input v-model="platform.deviceGBId" clearable @input="deviceGBIdChange"></el-input>
+              <el-input v-model="value.deviceGBId" clearable @input="deviceGBIdChange"></el-input>
             </el-form-item>
             <el-form-item label="本地IP" prop="deviceIp">
-              <el-select v-model="platform.deviceIp" placeholder="请选择与上级相通的网卡" style="width: 100%">
+              <el-select v-model="value.deviceIp" placeholder="请选择与上级相通的网卡" style="width: 100%">
                 <el-option
                   v-for="ip in deviceIps"
                   :key="ip"
@@ -45,33 +45,33 @@
               </el-select>
             </el-form-item>
             <el-form-item label="本地端口" prop="devicePort">
-              <el-input v-model="platform.devicePort" :disabled="true" type="number"></el-input>
+              <el-input v-model="value.devicePort" :disabled="true" type="number"></el-input>
             </el-form-item>
             <el-form-item label="SDP发流IP" prop="sendStreamIp">
-              <el-input v-model="platform.sendStreamIp"></el-input>
+              <el-input v-model="value.sendStreamIp"></el-input>
             </el-form-item>
           </el-form>
         </el-col>
         <el-col :span="12">
           <el-form ref="platform2" :rules="rules" :model="platform" label-width="160px">
             <el-form-item label="行政区划" prop="administrativeDivision">
-              <el-input v-model="platform.administrativeDivision" clearable></el-input>
+              <el-input v-model="value.civilCode" clearable></el-input>
             </el-form-item>
             <el-form-item label="SIP认证用户名" prop="username">
-              <el-input v-model="platform.username"></el-input>
+              <el-input v-model="value.username"></el-input>
             </el-form-item>
             <el-form-item label="SIP认证密码" prop="password">
-              <el-input v-model="platform.password"></el-input>
+              <el-input v-model="value.password"></el-input>
             </el-form-item>
             <el-form-item label="注册周期(秒)" prop="expires">
-              <el-input v-model="platform.expires"></el-input>
+              <el-input v-model="value.expires"></el-input>
             </el-form-item>
             <el-form-item label="心跳周期(秒)" prop="keepTimeout">
-              <el-input v-model="platform.keepTimeout"></el-input>
+              <el-input v-model="value.keepTimeout"></el-input>
             </el-form-item>
             <el-form-item label="信令传输" prop="transport">
               <el-select
-                v-model="platform.transport"
+                v-model="value.transport"
                 style="width: 100%"
                 placeholder="请选择信令传输方式"
               >
@@ -81,7 +81,7 @@
             </el-form-item>
             <el-form-item label="目录分组" prop="catalogGroup">
               <el-select
-                v-model="platform.catalogGroup"
+                v-model="value.catalogGroup"
                 style="width: 100%"
                 placeholder="请选择目录分组"
               >
@@ -93,7 +93,7 @@
             </el-form-item>
             <el-form-item label="字符集" prop="characterSet">
               <el-select
-                v-model="platform.characterSet"
+                v-model="value.characterSet"
                 style="width: 100%"
                 placeholder="请选择字符集"
               >
@@ -101,13 +101,20 @@
                 <el-option label="UTF-8" value="UTF-8"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="其他选项">
+            <el-form-item label="其他选项" >
-              <el-checkbox label="启用" v-model="platform.enable" @change="checkExpires"></el-checkbox>
+              <div style="text-align: left">
-              <!--                <el-checkbox label="云台控制" v-model="platform.ptz"></el-checkbox>-->
+                <el-checkbox label="启用" v-model="value.enable" @change="checkExpires"></el-checkbox>
-              <el-checkbox label="拉起推流" v-model="platform.startOfflinePush"></el-checkbox>
+                <!--                <el-checkbox label="云台控制" v-model="value.ptz"></el-checkbox>-->
-              <el-checkbox label="RTCP保活" v-model="platform.rtcp" @change="rtcpCheckBoxChange"></el-checkbox>
+                <el-checkbox label="RTCP保活" v-model="value.rtcp" @change="rtcpCheckBoxChange"></el-checkbox>
-              <el-checkbox label="消息通道" v-model="platform.asMessageChannel"></el-checkbox>
+                <el-checkbox label="消息通道" v-model="value.asMessageChannel"></el-checkbox>
-              <el-checkbox label="推送通道" v-model="platform.autoPushChannel"></el-checkbox>
+                <el-checkbox label="主动推送通道" v-model="value.autoPushChannel"></el-checkbox>
+                <el-checkbox label="主动推送通道" v-model="value.autoPushChannel"></el-checkbox>
+                <el-checkbox label="主动推送通道" v-model="value.autoPushChannel"></el-checkbox>
+                <el-checkbox label="主动推送通道" v-model="value.autoPushChannel"></el-checkbox>
+                <el-checkbox label="主动推送通道" v-model="value.autoPushChannel"></el-checkbox>
+              </div>
+
+
             </el-form-item>
             <el-form-item>
               <el-button type="primary" @click="onSubmit">{{
@@ -130,13 +137,28 @@ export default {
   props: [ 'value', 'closeEdit'],
   components: {
   },
-  created() {},
+  created() {
+
+  },
   watch: {
     value(newValue, oldValue){
       this.streamProxy = newValue;
     }
   },
   data() {
+    var deviceGBIdRules = async (rule, value, callback) => {
+      console.log(value);
+      if (value === "") {
+        callback(new Error("请输入设备国标编号"));
+      } else {
+        var exit = await this.deviceGBIdExit(value);
+        if (exit) {
+          callback(new Error("设备国标编号已存在"));
+        } else {
+          callback();
+        }
+      }
+    }
     return {
       listChangeCallback: null,
       showDialog: false,
@@ -244,38 +266,22 @@ export default {
       }
 
     },
-    close: function () {
+    checkExpires: function () {
-      this.closeEdit()
+      if (this.value.enable && this.value.expires === "0") {
-    },
+        this.value.expires = "3600";
-    mediaServerIdChange:function (){
-      if (this.streamProxy.mediaServerId !== "auto"){
-        this.$axios({
-          method: 'get',
-          url:`/api/proxy/ffmpeg_cmd/list`,
-          params: {
-            mediaServerId: this.streamProxy.mediaServerId
       }
-        }).then((res)=> {
+    },
-          this.ffmpegCmdList = res.data.data;
+    rtcpCheckBoxChange: function (result) {
-          this.streamProxy.ffmpegCmdKey = Object.keys(res.data.data)[0];
+      if (result) {
-        }).catch(function (error) {
+        this.$message({
-          console.log(error);
+          showClose: true,
+          message: "开启RTCP保活需要上级平台支持，可以避免无效推流",
+          type: "warning",
         });
       }
-
     },
-    noneReaderHandler: function() {
+    close: function () {
-      console.log(this.streamProxy)
+      this.closeEdit()
-      if (!this.streamProxy.noneReader || this.streamProxy.noneReader === 0 ) {
-        this.streamProxy.enableDisableNoneReader = false;
-        this.streamProxy.enableRemoveNoneReader = false;
-      }else if (this.streamProxy.noneReader === 1){
-        this.streamProxy.enableDisableNoneReader = true;
-        this.streamProxy.enableRemoveNoneReader = false;
-      }else if (this.streamProxy.noneReader ===2){
-        this.streamProxy.enableDisableNoneReader = false;
-        this.streamProxy.enableRemoveNoneReader = true;
-      }
     },
   },
 };

web_src/src/components/PlatformList.vue

@@ -1,5 +1,6 @@
 <template>
   <div id="app" style="width: 100%">
+    <div v-if="!platform">
       <div class="page-header">
         <div class="page-title">上级平台列表</div>
         <div class="page-header-btn">
@@ -9,7 +10,7 @@
       </div>
 
       <!--设备列表-->
-    <el-table :data="platformList" style="width: 100%" :height="winHeight">
+      <el-table size=mini :data="platformList" style="width: 100%" :height="winHeight">
         <el-table-column prop="name" label="名称" ></el-table-column>
         <el-table-column prop="serverGBId" label="平台编号" min-width="200"></el-table-column>
         <el-table-column label="是否启用" min-width="80" >
@@ -67,26 +68,32 @@
         layout="total, sizes, prev, pager, next"
         :total="total">
       </el-pagination>
-    <platformEdit ref="platformEdit" ></platformEdit>
+    </div>
+
+    <platformEdit ref="platformEdit" v-if="platform" v-model="platform" :closeEdit="closeEdit" ></platformEdit>
     <chooseChannelDialog ref="chooseChannelDialog" ></chooseChannelDialog>
   </div>
 </template>
 
 <script>
-import platformEdit from './dialog/platformEdit.vue'
 import uiHeader from '../layout/UiHeader.vue'
 import chooseChannelDialog from './dialog/chooseChannel.vue'
+import platformEdit from './PlatformEdit.vue'
+import streamProxyEdit from "./dialog/StreamProxyEdit.vue";
 export default {
   name: 'app',
   components: {
-    platformEdit,
+    streamProxyEdit,
     uiHeader,
-    chooseChannelDialog
+    chooseChannelDialog,
+    platformEdit
   },
   data() {
     return {
       platformList: [], //设备列表
-
+      deviceIps: [], //设备列表
+      defaultPlatform: null,
+      platform: null,
       winHeight: window.innerHeight - 260,
       currentPage:1,
       count:15,
@@ -108,12 +115,16 @@ export default {
   },
   methods: {
     addParentPlatform: function() {
-      this.$refs.platformEdit.openDialog(null, this.initData)
+      this.platform = this.defaultPlatform;
     },
     editPlatform: function(platform) {
       console.log(platform)
       this.$refs.platformEdit.openDialog(platform, this.initData)
     },
+    closeEdit: function() {
+      this.platform = null;
+      this.getPlatformList()
+    },
     deletePlatform: function(platform) {
         var that = this;
         that.$confirm('确认删除?', '提示', {
@@ -147,6 +158,42 @@ export default {
        this.$refs.chooseChannelDialog.openDialog(platform.serverGBId,platform.deviceGBId, platform.name, platform.catalogId, this.initData)
     },
     initData: function() {
+      this.$axios({
+        method: 'get',
+        url: `/api/platform/server_config`
+      }).then((res)=> {
+        if (res.data.code === 0) {
+          this.deviceIps = res.data.data.deviceIp.split(',');
+          this.defaultPlatform = {
+            id: null,
+            enable: true,
+            ptz: true,
+            rtcp: false,
+            asMessageChannel: false,
+            autoPushChannel: false,
+            name: null,
+            serverGBId: null,
+            serverGBDomain: null,
+            serverIP: null,
+            serverPort: null,
+            deviceGBId: res.data.data.username,
+            deviceIp: this.deviceIps[0],
+            devicePort: res.data.data.devicePort,
+            username: res.data.data.username,
+            password: res.data.data.password,
+            expires: 3600,
+            keepTimeout: 60,
+            transport: "UDP",
+            characterSet: "GB2312",
+            startOfflinePush: false,
+            catalogGroup: 1,
+            administrativeDivision: res.data.data.username.substr(0, 6),
+            sendStreamIp: res.data.data.sendStreamIp,
+          }
+        }
+      }).catch(function (error) {
+        console.log(error);
+      });
       this.getPlatformList();
     },
     currentChange: function(val){

web_src/src/components/StreamProxyList.vue

@@ -32,7 +32,7 @@
         </div>
       </div>
       <devicePlayer ref="devicePlayer"></devicePlayer>
-      <el-table :data="streamProxyList" style="width: 100%" :height="winHeight">
+      <el-table size=mini :data="streamProxyList" style="width: 100%" :height="winHeight">
         <el-table-column prop="app" label="流应用名" min-width="120" show-overflow-tooltip/>
         <el-table-column prop="stream" label="流ID" min-width="120" show-overflow-tooltip/>
         <el-table-column label="流地址" min-width="250"  show-overflow-tooltip >

web_src/src/components/StreamPushList.vue

@@ -40,7 +40,7 @@
           <el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
         </div>
       </div>
-      <el-table ref="pushListTable" :data="pushList" style="width: 100%" :height="winHeight" :loading="loading"
+      <el-table size=mini ref="pushListTable" :data="pushList" style="width: 100%" :height="winHeight" :loading="loading"
                 @selection-change="handleSelectionChange" :row-key="(row)=> row.app + row.stream">
         <el-table-column  type="selection" :reserve-selection="true" min-width="55">
         </el-table-column>

web_src/src/components/UserApiKeyManager.vue

@@ -11,7 +11,7 @@
       </div>
     </div>
     <!--ApiKey列表-->
-    <el-table :data="userList" style="width: 100%;font-size: 12px;" :height="winHeight"
+    <el-table size=mini :data="userList" style="width: 100%;font-size: 12px;" :height="winHeight"
               header-row-class-name="table-header">
       <el-table-column prop="user.username" label="用户名" min-width="120"/>
       <el-table-column prop="app" label="应用名" min-width="160"/>

web_src/src/components/UserManager.vue

@@ -12,7 +12,7 @@
       </div>
     </div>
     <!--用户列表-->
-    <el-table :data="userList" style="width: 100%;font-size: 12px;" :height="winHeight"
+    <el-table size=mini :data="userList" style="width: 100%;font-size: 12px;" :height="winHeight"
               header-row-class-name="table-header">
       <el-table-column prop="username" label="用户名" min-width="160"/>
       <el-table-column prop="pushKey" label="pushkey" min-width="160"/>

web_src/src/components/channelList.vue

@@ -50,7 +50,7 @@
         <DeviceTree ref="deviceTree" :device="device" :onlyCatalog="true" :clickEvent="treeNodeClickEvent"></DeviceTree>
       </el-aside>
       <el-main style="padding: 5px;">
-        <el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%"
+        <el-table size=mini ref="channelListTable" :data="deviceChannelList" :height="winHeight" style="width: 100%"
                   header-row-class-name="table-header">
           <el-table-column prop="name" label="名称" min-width="180">
           </el-table-column>

web_src/src/components/dialog/GbDeviceSelect.vue

@@ -27,7 +27,7 @@
         </div>
       </div>
       <!--设备列表-->
-      <el-table :data="deviceList" style="width: 100%;font-size: 12px;" :height="winHeight" header-row-class-name="table-header" @selection-change="handleSelectionChange">
+      <el-table size=mini :data="deviceList" style="width: 100%;font-size: 12px;" :height="winHeight" header-row-class-name="table-header" @selection-change="handleSelectionChange">
         <el-table-column type="selection" width="55" >
         </el-table-column>
         <el-table-column prop="name" label="名称" min-width="160">

web_src/src/components/dialog/chooseChannelForGb.vue

@@ -24,7 +24,7 @@
      <el-button v-if="catalogId !== null" type="danger" icon="el-icon-delete" size="mini" @click="remove()">全部移除</el-button>
     </div>
 
-    <el-table ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" :height="winHeight" :row-key="(row)=> row.deviceId + row.channelId" @selection-change="handleSelectionChange">
+    <el-table size=mini ref="gbChannelsTable" :data="gbChannels" border style="width: 100%" :height="winHeight" :row-key="(row)=> row.deviceId + row.channelId" @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" :reserve-selection="true" width="55">
         </el-table-column>
         <el-table-column prop="channelId" label="通道编号" width="180" align="center">

web_src/src/components/dialog/chooseChannelForStream.vue

@@ -27,7 +27,7 @@
       <el-button v-if="catalogId === null"  icon="el-icon-plus" size="mini" style="margin-right: 1rem;" @click="add()">全部添加</el-button>
       <el-button v-if="catalogId !== null" type="danger" icon="el-icon-delete" size="mini" style="margin-right: 1rem;" @click="remove()">全部移除</el-button>
     </div>
-    <el-table ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" :height="winHeight" :row-key="(row)=> row.app + row.stream" @selection-change="handleSelectionChange">
+    <el-table size=mini ref="gbStreamsTable" :data="gbStreams" border style="width: 100%" :height="winHeight" :row-key="(row)=> row.app + row.stream" @selection-change="handleSelectionChange">
         <el-table-column align="center" type="selection" :reserve-selection="true" width="55">
         </el-table-column>
         <el-table-column prop="name" label="名称" show-overflow-tooltip align="center">

web_src/src/components/group.vue

@@ -37,7 +37,7 @@
             </div>
           </div>
         </div>
-        <el-table ref="channelListTable" :data="channelList" :height="winHeight" style="width: 100%"
+        <el-table size=mini ref="channelListTable" :data="channelList" :height="winHeight" style="width: 100%"
                   header-row-class-name="table-header" @selection-change="handleSelectionChange" @row-dblclick="rowDblclick">
           <el-table-column type="selection" width="55" :selectable="selectable">
           </el-table-column>
@@ -67,8 +67,8 @@
           <el-table-column label="添加状态" min-width="100">
             <template slot-scope="scope">
               <div slot="reference" class="name-wrapper">
-                <el-tag size="medium" :title="scope.row.gbParentId" v-if="scope.row.gbParentId">已添加</el-tag>
+                <el-tag size="medium" :title="scope.row.gbBusinessGroupId" v-if="scope.row.gbBusinessGroupId">已添加</el-tag>
-                <el-tag size="medium" type="info" v-if="!scope.row.gbParentId">未添加</el-tag>
+                <el-tag size="medium" type="info" v-if="!scope.row.gbBusinessGroupId">未添加</el-tag>
               </div>
             </template>
           </el-table-column>

web_src/src/components/region.vue

@@ -37,7 +37,7 @@
             </div>
           </div>
         </div>
-        <el-table ref="channelListTable" :data="channelList" :height="winHeight" style="width: 100%"
+        <el-table size=mini ref="channelListTable" :data="channelList" :height="winHeight" style="width: 100%"
                   header-row-class-name="table-header" @selection-change="handleSelectionChange" @row-dblclick="rowDblclick">
           <el-table-column type="selection" width="55" :selectable="selectable">
           </el-table-column>