Browse Source

/*视频预览点击一路视频播放之后点击录像按钮报500错误问题修改。*/

master
htjcAdmin 3 months ago
parent
commit
bbf055feb1
2 changed files with 18 additions and 14 deletions
  1. +9
    -13
      inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolVideotapeController.java
  2. +9
    -1
      inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/model/RecordModel.java

+ 9
- 13
inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/controller/PatrolVideotapeController.java View File

@ -23,6 +23,7 @@ import com.inspect.patrol.service.impl.Video2NvrComponent;
import java.util.Date;
import javax.servlet.http.HttpServletRequest;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
@ -30,6 +31,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
@Slf4j
@ApiIgnore
@RestController
@RequestMapping({"/videotape"})
@ -56,21 +58,15 @@ public class PatrolVideotapeController extends BaseController {
@GetMapping({"/record"})
public AjaxResult record(RecordModel recordModel) throws Exception {
log.info("record start param: {}", recordModel);
String action = recordModel.getAction();
byte var5 = -1;
if (action.equals("0")) {
var5 = 0;
} else if (action.equals("1")) {
var5 = 1;
}
switch (var5) {
case 0:
this.redisService.redisTemplate.opsForHash().put(REDIS_KEY_RECORD, recordModel.getStreamId(), new Date());
switch (action) {
case "0":
this.redisService.redisTemplate.opsForHash().put(REDIS_KEY_RECORD, recordModel.getStreamid(), new Date());
String params = JsonUtil.json2Str(JSONObject.parseObject(JSONObject.toJSONString(recordModel)));
String result = HttpClientUtils.get(this.deviceUrl + AccessApiConstant.RECORD_START, params);
return AjaxResult.success(result);
case 1:
case "1":
return AjaxResult.success(this.stopRecord(recordModel));
default:
return AjaxResult.error("录屏失败,状态识别异常!");
@ -86,8 +82,8 @@ public class PatrolVideotapeController extends BaseController {
@GetMapping({"stop"})
private JSONObject stopRecord(RecordModel recordModel) throws Exception {
String params = JsonUtil.json2Str(JSONObject.parseObject(JSONObject.toJSONString(recordModel)));
if (this.redisService.redisTemplate.opsForHash().hasKey(REDIS_KEY_RECORD, recordModel.getStreamId()).booleanValue()) {
this.redisService.redisTemplate.opsForHash().delete(REDIS_KEY_RECORD, recordModel.getStreamId());
if (this.redisService.redisTemplate.opsForHash().hasKey(REDIS_KEY_RECORD, recordModel.getStreamid()).booleanValue()) {
this.redisService.redisTemplate.opsForHash().delete(REDIS_KEY_RECORD, recordModel.getStreamid());
String result = HttpClientUtils.get(this.deviceUrl + AccessApiConstant.RECORD_STOP, params);
return JSONObject.parseObject(result);
} else {


+ 9
- 1
inspect-main/inspect-main-video/src/main/java/com/inspect/patrol/model/RecordModel.java View File

@ -1,5 +1,6 @@
package com.inspect.patrol.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.Setter;
@ -8,7 +9,14 @@ import java.io.Serializable;
@Setter
@Getter
public class RecordModel implements Serializable {
private String streamId;
private String streamid;
private String action;
@Override
public String toString() {
return "RecordModel{" +
"streamId='" + streamid + '\'' +
", action='" + action + '\'' +
'}';
}
}

Loading…
Cancel
Save