diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java index 8ffc5b0..87d29ea 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TermSetController.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @@ -46,8 +47,8 @@ public class TermSetController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getResolutionList") @Log(title = "获取分辨率代码", type = "查询") - public ResponseReult getResolutionList() { - ServiceBody serviceBody = termSetService.getResolutionList(); + public ResponseReult getResolutionList(@RequestParam("type") Integer type) { + ServiceBody serviceBody = termSetService.getResolutionList(type); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalVideoParamsModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalVideoParamsModel.java index 58e9192..694134a 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalVideoParamsModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalVideoParamsModel.java @@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.io.Serializable; /** @@ -14,10 +16,19 @@ import java.io.Serializable; public class TerminalVideoParamsModel implements Serializable { @ApiModelProperty(value = "装置编号", example = "123456") - private Integer termId; + private String cmdId; @ApiModelProperty(value = "通道编号", example = "123456") - private Short channel; + private Integer channel; + + @ApiModelProperty(value = "视频格式", example = "123456") + private Integer format; + + @ApiModelProperty(value = "录制时长", example = "123456") + private Integer time; + + @ApiModelProperty(value = "录制时长", example = "123456") + private Boolean isNew = false; } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java index 1df730e..640e0df 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoGetVo.java @@ -8,7 +8,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Data -@ApiModel(value = "声光报警设置对象", description = "声光报警设置对象描述") +@ApiModel(value = "视频控制对象", description = "视频控制对象描述") public class VideoGetVo { @NotBlank(message = "监测装置ID") diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoParamsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoParamsVo.java index 79c997c..4a20c10 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoParamsVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/VideoParamsVo.java @@ -4,20 +4,26 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + @Data @ApiModel(value = "视频控制参数对象", description = "视频控制参数对象") public class VideoParamsVo { + @NotBlank(message = "装置编号不能缺少") @ApiModelProperty(value = "装置编号", example = "123456") private String cmdId; + @NotNull(message = "通道编号不能缺少") @ApiModelProperty(value = "通道编号", example = "123456") private Integer channel; - - @ApiModelProperty(value = "不知道是啥", example = "123456") + @NotNull(message = "视频格式不能缺少") + @ApiModelProperty(value = "视频格式", example = "123456") private Integer format; - @ApiModelProperty(value = "不知道是啥", example = "123456") + @NotNull(message = "录制时长不能缺少") + @ApiModelProperty(value = "录制时长", example = "123456") private Integer time; diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalResolutionDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalResolutionDao.java index e9cfd52..4603134 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalResolutionDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalResolutionDao.java @@ -1,12 +1,13 @@ package com.shxy.xymanager_dao.dao; import com.shxy.xymanager_common.entity.Resolution; +import org.apache.ibatis.annotations.Param; import java.util.List; public interface TerminalResolutionDao { - List selectAllList(); + List selectAllList(@Param("type") Integer type); int insert(Resolution record); diff --git a/xymanager_dao/src/main/resources/mappers/TerminalResolutionDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalResolutionDao.xml index 19bf807..d6311aa 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalResolutionDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalResolutionDao.xml @@ -8,12 +8,12 @@ - insert into resolution (id, name) - values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}) - + insert into resolution (id, name) + values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}) + insert into resolution diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java index 9732ced..557b62b 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TermSetServiceImpl.java @@ -51,9 +51,9 @@ public class TermSetServiceImpl implements TermSetService { * @return */ @Override - public ServiceBody getResolutionList() { + public ServiceBody getResolutionList(Integer type) { ResolutionModel model = new ResolutionModel(); - List beans = terminalResolutionDao.selectAllList(); + List beans = terminalResolutionDao.selectAllList(type); List list = BeanUtil.copyToList(beans, ResolutionModel.ResolutionBean.class); model.setList(list); return Asserts.success(model); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalVideoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalVideoServiceImpl.java index 45641fd..08ae844 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalVideoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalVideoServiceImpl.java @@ -49,11 +49,13 @@ import java.util.List; @Slf4j public class TerminalVideoServiceImpl implements TerminalVideoService { + @Autowired + TerminalPhotoDao terminalPhotoDao; @Override public ServiceBody updateVideoParam(VideoParamsVo vo) { - String cmd = Constants.CMD+"videoparams --flag=1 --preset=255 --cmdid="+vo.getCmdId()+ " --channel=" + vo.getChannel()+ " --format=" + - vo.getFormat()+ " --time=" +vo.getTime(); + String cmd = Constants.CMD + "videoparams --flag=1 --preset=255 --cmdid=" + vo.getCmdId() + " --channel=" + vo.getChannel() + " --format=" + + vo.getFormat() + " --time=" + vo.getTime(); ProcessExecUtils.exec(cmd); return Asserts.success("修改完成"); } @@ -61,14 +63,21 @@ public class TerminalVideoServiceImpl implements TerminalVideoService { @Override public ServiceBody videoParamGet(VideoGetVo vo) { GetModel model = new GetModel(); - String cmd = Constants.CMD+"videoparams --clientid=10 --flag=0 --cmdid="+vo.getCmdId()+ "\t"+"--reqid="+Constants.REQUEST_ID+"\t"+"--channel="+vo.getChannelId(); + String cmd = Constants.CMD + "videoparams --clientid=10 --flag=0 --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--channel=" + vo.getChannelId(); ProcessExecUtils.exec(cmd); - model.setRequestId(Integer.parseInt( Constants.REQUEST_ID.toString())); + model.setRequestId(Integer.parseInt(Constants.REQUEST_ID.toString())); Constants.REQUEST_ID.addAndGet(1); return Asserts.success(model); } + @Override public ServiceBody selectVideoParam(Integer requestId) { - return null; + String result = terminalPhotoDao.getRequestResult(requestId);//待修改 + TerminalVideoParamsModel model = new TerminalVideoParamsModel(); + if (StringUtils.isNotBlank(result)) { + model = JSONObject.parseObject(result, TerminalVideoParamsModel.class); + model.setIsNew(true); + } + return Asserts.success(model); } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TermSetService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TermSetService.java index a57ca12..3c336df 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TermSetService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TermSetService.java @@ -23,7 +23,8 @@ public interface TermSetService { /** * 获取所有分辨率列表 + * * @return */ - ServiceBody getResolutionList(); + ServiceBody getResolutionList(Integer type); }