Merge branch 'wvp-28181-2.0' into main-dev

# Conflicts:
#	pom.xml
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/SIPRequestHeaderProvider.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/ByeRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/InviteRequestProcessor.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/AssistRESTfulUtils.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
#	src/main/java/com/genersoft/iot/vmp/media/zlm/dto/HookSubscribeFactory.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlatformServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformChannelMapper.java
#	src/main/resources/all-application.yml
#	src/main/resources/application-dev.yml

web_src/src/components/dialog/deviceEdit.vue

@@ -20,7 +20,7 @@
             <el-input v-model="form.name" clearable></el-input>
           </el-form-item>
           <el-form-item label="密码" prop="password">
-            <el-input type="password" v-model="form.password" clearable></el-input>
+            <el-input v-model="form.password" clearable></el-input>
           </el-form-item>
           <el-form-item label="收流IP" prop="sdpIp">
             <el-input type="sdpIp" v-model="form.sdpIp" clearable></el-input>

web_src/src/components/dialog/devicePlayer.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="devicePlayer" v-loading="isLoging">
 
-    <el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()">
+    <el-dialog title="视频播放" top="0" :close-on-click-modal="false" :visible.sync="showVideoDialog" @close="close()" v-if="showVideoDialog">
       <div style="width: 100%; height: 100%">
         <el-tabs type="card" :stretch="true" v-model="activePlayer" @tab-click="changePlayer"
                  v-if="Object.keys(this.player).length > 1">

web_src/src/components/dialog/easyPlayer.vue

@@ -1,67 +0,0 @@
-<template>
-  <div id="easyplayer"></div>
-</template>
-
-<script>
-export default {
-    name: 'player',
-    data() {
-        return {
-            easyPlayer: null
-        };
-    },
-    props: ['videoUrl', 'error', 'hasaudio', 'height'],
-    mounted () {
-      let paramUrl = decodeURIComponent(this.$route.params.url)
-       this.$nextTick(() =>{
-          if (typeof (this.videoUrl) == "undefined") {
-            this.videoUrl = paramUrl;
-          }
-          console.log("初始化时的地址为: " + this.videoUrl)
-          this.play(this.videoUrl)
-        })
-    },
-    watch:{
-        videoUrl(newData, oldData){
-            this.play(newData)
-        },
-        immediate:true
-    },
-    methods: {
-        play: function (url) {
-          console.log(this.height)
-            if (this.easyPlayer != null) {
-              this.easyPlayer.destroy();
-            }
-            if (typeof (this.height) == "undefined") {
-              this.height = false
-            }
-            this.easyPlayer = new WasmPlayer(null, 'easyplayer', this.eventcallbacK, {Height: this.height})
-            this.easyPlayer.play(url, 1)
-        },
-        pause: function () {
-          this.easyPlayer.destroy();
-          this.easyPlayer = null
-        },
-        eventcallbacK: function(type, message) {
-            // console.log("player 事件回调")
-            // console.log(type)
-            // console.log(message)
-        }
-    },
-    destroyed() {
-      this.easyPlayer.destroy();
-    },
-}
-</script>
-
-<style>
-    .LodingTitle {
-        min-width: 70px;
-    }
-    /* 隐藏logo */
-    .iconqingxiLOGO {
-        display: none !important;
-    }
-
-</style>

web_src/src/components/dialog/recordDownload.vue

@@ -6,8 +6,7 @@
         <el-progress :percentage="percentage"></el-progress>
       </el-col>
       <el-col :span="6" >
-        <el-button icon="el-icon-download" v-if="percentage < 100" size="mini" title="点击下载可将以缓存部分下载到本地" @click="download()">停止缓存并下载</el-button>
-        <el-button icon="el-icon-download" v-if="downloadFile" size="mini" title="点击下载" @click="downloadFileClientEvent()">点击下载</el-button>
+        <el-button icon="el-icon-download" v-if="downloadFile" size="mini" title="点击下载" @click="downloadFileClientEvent()">下载</el-button>
       </el-col>
     </el-row>
   </el-dialog>
@@ -27,7 +26,7 @@ export default {
     },
     data() {
         return {
-          title: "四倍速下载中...",
+          title: "下载中...",
           deviceId: "",
           channelId: "",
           app: "",
@@ -39,7 +38,6 @@ export default {
           streamInfo: null,
           taskId: null,
           getProgressRun: false,
-          getProgressForFileRun: false,
           timer: null,
           downloadFile: null,
 
@@ -62,7 +60,7 @@ export default {
             return;
           }
           if (this.percentage == 100 ) {
-            this.getFileDownload();
+
             return;
           }
           setTimeout( ()=>{
@@ -75,7 +73,6 @@ export default {
             method: 'get',
             url: `/api/gb_record/download/progress/${this.deviceId}/${this.channelId}/${this.stream}`
           }).then((res)=> {
-            console.log(res)
               if (res.data.code === 0) {
                 this.streamInfo = res.data.data;
                 if (parseFloat(res.data.progress) == 1) {
@@ -83,6 +80,15 @@ export default {
                 }else {
                   this.percentage = (parseFloat(res.data.data.progress)*100).toFixed(1);
                 }
+                if (this.streamInfo.downLoadFilePath) {
+                  if (location.protocol === "https:") {
+                    this.downloadFile = this.streamInfo.downLoadFilePath.httpsPath;
+                  }else {
+                    this.downloadFile = this.streamInfo.downLoadFilePath.httpPath;
+                  }
+                  this.getProgressRun = false;
+                  this.downloadFileClientEvent()
+                }
                 if (callback)callback();
               }else {
                 this.$message({
@@ -108,24 +114,11 @@ export default {
           }
           this.showDialog=false;
           this.getProgressRun = false;
-          this.getProgressForFileRun = false;
         },
         gbScale: function (scale){
           this.scale = scale;
         },
-        download: function (){
-          this.getProgressRun = false;
-          if (this.streamInfo != null ) {
-            if (this.streamInfo.progress < 1) {
-              // 发送停止缓存
-              this.stopDownloadRecord((res)=>{
-                  this.getFileDownload()
-              })
-            }else {
-              this.getFileDownload()
-            }
-          }
-        },
+
         stopDownloadRecord: function (callback) {
           this.$axios({
             method: 'get',
@@ -134,74 +127,20 @@ export default {
             if (callback) callback(res)
           });
         },
-        getFileDownload: function (){
-          this.$axios({
-            method: 'get',
-            url:`/record_proxy/${this.mediaServerId}/api/record/file/download/task/add`,
-            params: {
-              app: this.app,
-              stream: this.stream,
-              startTime: null,
-              endTime: null,
-            }
-          }).then((res) =>{
-            if (res.data.code === 0 ) {
-              // 查询进度
-              this.title = "录像文件处理中..."
-              this.taskId = res.data.data;
-              this.percentage = 0.0;
-              this.getProgressForFileRun = true;
-              this.getProgressForFileTimer();
-            }
-          }).catch(function (error) {
-            console.log(error);
-          });
-        },
-        getProgressForFileTimer: function (){
-          if (!this.getProgressForFileRun || this.percentage == 100) {
-            return;
-          }
-          setTimeout( ()=>{
-            if (!this.showDialog) return;
-            this.getProgressForFile(this.getProgressForFileTimer)
-          }, 1000)
-        },
-        getProgressForFile: function (callback){
-          this.$axios({
-            method: 'get',
-            url:`/record_proxy/${this.mediaServerId}/api/record/file/download/task/list`,
-            params: {
-              app: this.app,
-              stream: this.stream,
-              taskId: this.taskId,
-              isEnd: true,
-            }
-          }).then((res) => {
-            console.log(res)
-            if (res.data.code === 0) {
-              if (res.data.data.length === 0){
-                this.percentage = 0
-                // 往往在多次请求后（实验五分钟的视频是三次请求），才会返回数据，第一次请求通常是返回空数组
-                if (callback)callback()
-                return
-              }
-              // res.data.data应是数组类型
-                this.percentage = parseFloat(res.data.data[0].percentage)*100
-                 if (res.data.data[0].percentage === '1') {
-                   this.getProgressForFileRun = false;
-                   this.downloadFile = res.data.data[0].downloadFile
-                   this.title = "文件处理完成，点击按扭下载"
-                   // window.open(res.data.data[0].downloadFile)
-                 }else {
-                   if (callback)callback()
-                 }
-            }
-          }).catch(function (error) {
-            console.log(error);
-          });
-        },
       downloadFileClientEvent: function (){
-        window.open(this.downloadFile )
+        // window.open(this.downloadFile )
+
+        let x = new XMLHttpRequest();
+        x.open("GET", this.downloadFile, true);
+        x.responseType = 'blob';
+        x.onload=(e)=> {
+          let url = window.URL.createObjectURL(x.response)
+          let a = document.createElement('a');
+          a.href = url
+          a.download = this.deviceId + "-" + this.channelId + ".mp4";
+          a.click()
+        }
+        x.send();
       }
     },
     destroyed() {