From e5c5094d699a70919831fb7e9c879b30f688d247 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Sat, 13 May 2023 17:18:30 +0800 Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalPhotoController.java | 4 ++-- .../xymanager_common/vo/PhotoParamsVo.java | 2 +- .../vo/ReturnedPhotoParamsGetVo.java | 20 +++++++++++++++++++ .../impl/TerminalPhotoServiceImpl.java | 5 ++--- .../service/TerminalPhotoService.java | 2 +- 5 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java index 89da950..e8430eb 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalPhotoController.java @@ -154,8 +154,8 @@ public class TerminalPhotoController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getPhotoQueryParamList") @Log(title = "最新图片采集参数触发", type = "查询") - public ResponseReult getPhotoQueryParamList(@RequestParam("termId") Integer termId) { - ServiceBody serviceBody = terminalPhotoService.getPhotoQueryParam(termId); + public ResponseReult getPhotoQueryParamList(@RequestBody @Validated ReturnedPhotoParamsGetVo vo) { + ServiceBody serviceBody = terminalPhotoService.getPhotoQueryParam(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoParamsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoParamsVo.java index 30c36bc..651e11f 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoParamsVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoParamsVo.java @@ -30,7 +30,7 @@ public class PhotoParamsVo extends PageVo{ @ApiModelProperty(value = "饱和度，取值范围：1～100", example = "123456") private Integer saturation; - @ApiModelProperty(value = "心跳上送周期", example = "123456") + @ApiModelProperty(value = "装置ID", example = "123456") private String cmdId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java new file mode 100644 index 0000000..37a6f6b --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsGetVo.java @@ -0,0 +1,20 @@ +package com.shxy.xymanager_common.vo; + +import cn.hutool.core.date.DateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@ApiModel(value = "返回图片参数查询", description = "返回图片参数查询") +public class ReturnedPhotoParamsGetVo { + @NotNull(message = "不能传入空值") + @ApiModelProperty(value = "监测装置id", required = true, example = "A0001") + private String cmdId; + + + @ApiModelProperty(value = "通道ID", required = true, example = "A0001") + private Short channelId; +} diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index 0a61dc3..f71265a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -393,9 +393,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { } @Override - public ServiceBody getPhotoQueryParam(Integer termId) { - String cmdId = terminalPhotoDao.selectCmdIdById(termId); - String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+cmdId +"\t" +"--clientid=10 --reqid="+Constants.REQUEST_ID+"--flag=1 --rf=7"; + public ServiceBody getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) { + String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid="+vo.getCmdId() +"\t" +"--clientid=10 --reqid="+Constants.REQUEST_ID+"--flag=1 --rf=7 --channel=" + vo.getChannelId(); ProcessExecUtils.exec(cmd); /* TerminalPhotosParamsModel model = new TerminalPhotosParamsModel(); PhotoParamsDto dto= terminalPhotoDao.selectPhotoParams(termId); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java index 8a43854..6c69a6d 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java @@ -69,7 +69,7 @@ public interface TerminalPhotoService { * * @return */ - ServiceBody getPhotoQueryParam(Integer termId); + ServiceBody getPhotoQueryParam(ReturnedPhotoParamsGetVo vo); ServiceBody addOrUpdatePhotoParams(PhotoParamsVo vo);