diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpServerConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpServerConfig.java index 881551576..b2f9c0e13 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpServerConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpServerConfig.java @@ -1,8 +1,8 @@ package com.genersoft.iot.vmp.conf.ftpServer; +import lombok.extern.slf4j.Slf4j; import org.apache.ftpserver.*; import org.apache.ftpserver.ftplet.FtpException; -import org.apache.ftpserver.ftplet.Ftplet; import org.apache.ftpserver.listener.Listener; import org.apache.ftpserver.listener.ListenerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -15,13 +15,17 @@ import java.util.Map; @Configuration @ConditionalOnProperty(value = "ftp.enable", havingValue = "true") +@Slf4j public class FtpServerConfig { @Autowired private UserManager userManager; @Autowired - private ftplet ftpPlet; + private Ftplet ftpPlet; + + @Autowired + private FtpSetting ftpSetting; /** * ftp server init @@ -30,28 +34,31 @@ public class FtpServerConfig { public FtpServer ftpServer() { FtpServerFactory serverFactory = new FtpServerFactory(); ListenerFactory listenerFactory = new ListenerFactory(); -// //1、设置服务端口 - listenerFactory.setPort(3131); - //2、设置被动模式数据上传的接口范围,云服务器需要开放对应区间的端口给客户端 + // 1、设置服务端口 + listenerFactory.setPort(ftpSetting.getPort()); + // 2、设置被动模式数据上传的接口范围,云服务器需要开放对应区间的端口给客户端 DataConnectionConfigurationFactory dataConnectionConfFactory = new DataConnectionConfigurationFactory(); - dataConnectionConfFactory.setPassivePorts("10000-10500"); + dataConnectionConfFactory.setPassivePorts(ftpSetting.getPassivePorts()); listenerFactory.setDataConnectionConfiguration(dataConnectionConfFactory.createDataConnectionConfiguration()); - //4、替换默认的监听器 + // 4、替换默认的监听器 Listener listener = listenerFactory.createListener(); serverFactory.addListener("default", listener); - //5、配置自定义用户事件 - Map ftpLets = new HashMap(); + // 5、配置自定义用户事件 + Map ftpLets = new HashMap<>(); ftpLets.put("ftpService", ftpPlet); serverFactory.setFtplets(ftpLets); - //6、读取用户的配置信息 - //6.2、设置用信息 + // 6、读取用户的配置信息 + // 6.2、设置用信息 serverFactory.setUserManager(userManager); - //7、实例化FTP Server + // 7、实例化FTP Server FtpServer server = serverFactory.createServer(); try { server.start(); + if (!server.isStopped()) { + log.info("[FTP服务] 已启动, 端口： {}", ftpSetting.getPort()); + } } catch (FtpException e) { - System.out.println("ftp-启动失败" + e.getMessage()); + log.info("[FTP服务] 启动失败 ", e); } return server; } diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpSetting.java b/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpSetting.java index d9b798ab2..d61dfd05f 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpSetting.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/FtpSetting.java @@ -1,5 +1,6 @@ package com.genersoft.iot.vmp.conf.ftpServer; +import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; @@ -10,6 +11,7 @@ import org.springframework.stereotype.Component; @Component @ConfigurationProperties(prefix = "ftp", ignoreInvalidFields = true) @Order(0) +@Data public class FtpSetting { private Boolean enable = Boolean.FALSE; @@ -18,44 +20,5 @@ public class FtpSetting { private int port = 21; private String username = "admin"; private String password = "admin"; - - public Boolean getEnable() { - return enable; - } - - public void setEnable(Boolean enable) { - this.enable = enable; - } - - public String getIp() { - return ip; - } - - public void setIp(String ip) { - this.ip = ip; - } - - public int getPort() { - return port; - } - - public void setPort(int port) { - this.port = port; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } + private String passivePorts = "10000-10500"; } diff --git a/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/ftplet.java b/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/Ftplet.java similarity index 95% rename from src/main/java/com/genersoft/iot/vmp/conf/ftpServer/ftplet.java rename to src/main/java/com/genersoft/iot/vmp/conf/ftpServer/Ftplet.java index ce035c705..cf7c990ac 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/ftplet.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/ftpServer/Ftplet.java @@ -13,9 +13,9 @@ import java.io.IOException; @Component -public class ftplet extends DefaultFtplet { +public class Ftplet extends DefaultFtplet { - private final Logger logger = LoggerFactory.getLogger(ftplet.class); + private final Logger logger = LoggerFactory.getLogger(Ftplet.class); @Value("${ftp.username}") private String username; diff --git a/web/src/views/jtDevice/channel/record.vue b/web/src/views/jtDevice/channel/record.vue index 711a6aa19..162c904d3 100755 --- a/web/src/views/jtDevice/channel/record.vue +++ b/web/src/views/jtDevice/channel/record.vue @@ -89,17 +89,25 @@ title="截图" @click="snap()" /> -
+ + 快退 + + 1X + 2X + 4X + 8X + 16X + + - - - + 快进/快退 + >快进 - 正常快进 - 2倍速快进 - 4倍速快进 - 8倍速快进 - 16倍速快进 - 正常快退 - 2倍速快退 - 4倍速快退 - 8倍速快退 - 16倍速快退 + 1X + 2X + 4X + 8X + 16X
@@ -302,25 +299,6 @@ export default { snap() { this.$refs.recordVideoPlayer.screenshot() }, - chooseTimeForRecord() { - let startTime = this.startTime - let endTime = this.endTime - if (this.detailFiles.length > 0) { - startTime = this.detailFiles[0].startTime - endTime = this.detailFiles[this.detailFiles.length - 1].endTime - } - console.log(startTime) - console.log(endTime) - this.$refs.chooseTimeRange.openDialog([new Date(startTime), new Date(endTime)], (time) => { - console.log(time) - const startTime = moment(time[0]).format('YYYY-MM-DD HH:mm:ss') - const endTime = moment(time[1]).format('YYYY-MM-DD HH:mm:ss') - this.downloadFile({ - startTime: startTime, - endTime: endTime - }) - }) - }, playLast() { // 播放上一个 if (this.chooseFileIndex === 0) { @@ -335,36 +313,30 @@ export default { } this.chooseFile(this.chooseFileIndex + 1) }, - changePlaySpeed(speed) { - console.log(this.streamInfo) - console.log(speed) + scale(command) { + this.control(command[0], command[1]) + }, + control(command, playbackSpeed, time) { // 倍速播放 - this.playSpeed = speed - this.$store.dispatch('playback/setSpeed', [this.streamInfo.stream, speed]) - .then(data => { - this.$refs.recordVideoPlayer.setPlaybackRate(this.playSpeed) - }) - .catch((err) => { - console.log(err) - }) - }, - seekBackward() { - // 快退五秒 - this.playSeekValue -= 5 * 1000 - this.play() - }, - seekForward() { - // 快进五秒 - this.playSeekValue += 5 * 1000 - this.play() + this.playSpeed = playbackSpeed + this.$refs.recordVideoPlayer.setPlaybackRate(parseFloat(this.playSpeed)) + this.$store.dispatch('jtDevice/controlPlayback', { + phoneNumber: this.phoneNumber, + channelId: this.channelId, + command: command, + playbackSpeed: playbackSpeed, + time: time + }) }, stopPLay() { // 停止 this.$refs.recordVideoPlayer.destroy() + this.stopPlayRecord() }, pausePlay() { // 暂停 this.$refs.recordVideoPlayer.pause() + this.control(1, 0) }, play() { if (this.$refs.recordVideoPlayer.loaded) { @@ -448,6 +420,7 @@ export default { playRecord(startTime, endTime) { if (this.streamInfo !== null) { this.stopPlayRecord(() => { + this.streamInfo = null this.playRecord(startTime, endTime) }) } else { @@ -491,23 +464,47 @@ export default { this.downloadFile(row) }) } else { - const loading = this.$loading({ - lock: true, - text: '正在请求录像', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }) - this.$store.dispatch('gbRecord/startDownLoad', [ - this.deviceId, this.channelId, row.startTime, row.endTime, this.playSpeedRange[this.playSpeedRange.length - 1] - ]) - .then(streamInfo => { - this.$refs.recordDownload.openDialog(this.deviceId, this.channelId, streamInfo.app, streamInfo.stream, streamInfo.mediaServerId) - }) - .finally(() => { - loading.close() - }) + this.downloadRecord(row) } }, + downloadRecord: function(row) { + const loading = this.$loading({ + lock: true, + text: '正在请求录像', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) + const baseUrl = window.baseUrl ? window.baseUrl : '' + const downloadFileUrl = ((process.env.NODE_ENV === 'development') ? process.env.VUE_APP_BASE_API : baseUrl) + + `/api/jt1078/playback/download?phoneNumber=${this.phoneNumber}&channelId=${this.channelId}&startTime=${row.startTime}&endTime=${row.endTime}` + + `&alarmSign=${row.alarmSign}&mediaType=${row.mediaType}&streamType=${row.streamType}&storageType=${row.storageType}&access-token=${this.$store.getters.token}` + const x = new XMLHttpRequest() + x.open('GET', downloadFileUrl, true) + x.responseType = 'blob' + x.onload = (e) => { + const url = window.URL.createObjectURL(x.response) + const a = document.createElement('a') + a.href = url + a.download = this.phoneNumber + '-' + this.channelId + '.mp4' + a.click() + loading.close() + } + x.ontimeout = (e) => { + loading.close() + this.$message.error({ + showClose: true, + message: '加载超时' + }) + } + x.onerror = (e) => { + loading.close() + this.$message.error({ + showClose: true, + message: e.error + }) + } + x.send() + }, getFileShowName(item) { return moment(item.startTime).format('HH:mm:ss') + '-' + moment(item.endTime).format('HH:mm:ss') },