diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078Controller.java b/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078Controller.java index 9404e8f91..a02ab8b91 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078Controller.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078Controller.java @@ -326,8 +326,8 @@ public class JT1078Controller { @Parameter(name = "phoneNumber", description = "设备手机号", required = true) @Parameter(name = "channelId", description = "通道国标编号, 一般为从1开始的数字", required = true) @Parameter(name = "command", description = "0:开始回放; 1:暂停回放; 2:结束回放; 3:快进回放; 4:关键帧快退回放; 5:拖动回放; 6:关键帧播放", required = true) - @Parameter(name = "playbackSpeed", description = "0.无效 1.1倍 2.2倍 3.4倍 4.8倍 5.16倍 (回放控制为1和2时,此字段内容有效,否则置0)", required = true) - @Parameter(name = "time", description = "拖动回放位置(时间)", required = true) + @Parameter(name = "playbackSpeed", description = "0.无效 1.1倍 2.2倍 3.4倍 4.8倍 5.16倍 (回放控制为3和4时,此字段内容有效,否则置0)", required = false) + @Parameter(name = "time", description = "拖动回放位置(时间)", required = false) @GetMapping("/playback/control") public void recordControl(@Parameter(required = true) String phoneNumber, @Parameter(required = true) Integer channelId, diff --git a/web_src/src/components/JTRecordDetail.vue b/web_src/src/components/JTRecordDetail.vue index 3a61f9b78..2bb777bd5 100755 --- a/web_src/src/components/JTRecordDetail.vue +++ b/web_src/src/components/JTRecordDetail.vue @@ -57,18 +57,24 @@ - - - + + + + - 倍速 + 快进/快退 - 0.25倍速 - 0.5倍速 - 1倍速 - 2倍速 - 4倍速 + 正常快进 + 2倍速快进 + 4倍速快进 + 8倍速快进 + 16倍速快进 + 正常快退 + 2倍速快退 + 4倍速快退 + 8倍速快退 + 16倍速快退 @@ -297,19 +303,21 @@ this.$refs["recordVideoPlayer"].play(this.videoUrl) }); }, - gbPause(){ - console.log('前端控制:暂停'); + control(command, playbackSpeed, time){ this.$axios({ method: 'get', - url: '/api/playback/pause/' + this.streamId + url: '/api/jt1078/playback/control', + params: { + phoneNumber: this.phoneNumber, + channelId: this.channelId, + command: command, + playbackSpeed: playbackSpeed, + time: time + } }).then(function (res) {}); }, - gbScale(command){ - console.log('前端控制:倍速 ' + command); - this.$axios({ - method: 'get', - url: `/api/playback/speed/${this.streamId }/${command}` - }).then(function (res) {}); + scale(command){ + this.control(command[0], command[1]) }, downloadRecord: function (row) { if (!row) {