From 70885343ff36140d51adf77063c8f7326bad2ac5 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Tue, 16 May 2023 17:04:23 +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 | 2 +- .../vo/TerminalPhotoTimeGetVo.java | 23 +++++++++++++++++++ .../vo/TerminalReqPhotoTimeVo.java | 11 +++++++++ .../impl/TerminalPhotoServiceImpl.java | 10 ++++---- .../service/TerminalPhotoService.java | 2 +- 5 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.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 75df10b..12b08c8 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 @@ -76,7 +76,7 @@ public class TerminalPhotoController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/selectPhotoTimeGet") @Log(title = "拍照时间表查询触发", type = "查询") - public ResponseReult selectPhotoTimeGet(@RequestBody @Validated TerminalReqPhotoTimeVo vo) { + public ResponseReult selectPhotoTimeGet(@RequestBody @Validated TerminalPhotoTimeGetVo vo) { ServiceBody serviceBody = terminalPhotoService.selectPhotoTimeGet(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java new file mode 100644 index 0000000..e4d27ca --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalPhotoTimeGetVo.java @@ -0,0 +1,23 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +@ApiModel(value = "拍照时间表触发请求参数", description = "拍照时间表触发请求参数") +public class TerminalPhotoTimeGetVo { + + @NotNull(message = "通道号") + @ApiModelProperty(value = "通道号", example = "123455") + private Short channel; + + @NotNull(message = "检测装置ID不能缺少") + @ApiModelProperty(value = "检测装置ID", example = "123455") + private String cmdId; + + + +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalReqPhotoTimeVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalReqPhotoTimeVo.java index b382e38..b00cea9 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalReqPhotoTimeVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalReqPhotoTimeVo.java @@ -10,10 +10,21 @@ import javax.validation.constraints.NotNull; @ApiModel(value = "拍照时间表请求参数", description = "拍照时间表请求参数") public class TerminalReqPhotoTimeVo { + @NotNull(message = "通道号") + @ApiModelProperty(value = "通道号", example = "123455") + private Short channel; + + @NotNull(message = "装置ID不能缺少") + @ApiModelProperty(value = "装置ID", example = "123455") + private Short termId; + @NotNull(message = "检测装置ID不能缺少") @ApiModelProperty(value = "检测装置ID", example = "123455") private String cmdId; + @ApiModelProperty(value = "请求ID", example = "123455") + private Integer requestId; + } 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 ad184ad..6d28392 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 @@ -418,7 +418,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { @Override public ServiceBody getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo) { - String result = terminalPhotoDao.getRequestResult(5);//待修改 + String result = terminalPhotoDao.getRequestResult(vo.getRequestId());//待修改 TerminalPhotosParamsModel model = new TerminalPhotosParamsModel(); if (StringUtils.isNotBlank(result)) { model = JSONObject.parseObject(result, TerminalPhotosParamsModel.class); @@ -462,10 +462,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { } @Override - public ServiceBody selectPhotoTimeGet(TerminalReqPhotoTimeVo vo) { - String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=schedule --cmdid=" + vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--clientid=10 --flag=0 --rf=7"; + public ServiceBody selectPhotoTimeGet(TerminalPhotoTimeGetVo vo) { + String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=schedule --cmdid=" +vo.getCmdId() + "\t" + "--reqid=" + Constants.REQUEST_ID + "\t" + "--clientid=10 --flag=0 --rf=7 --channel="+vo.getChannel(); ProcessExecUtils.exec(cmd); - return Asserts.success(Integer.parseInt(Constants.REQUEST_ID.toString())); + Integer requestId = Integer.parseInt(Constants.REQUEST_ID.toString()); + Constants.REQUEST_ID.addAndGet(1); + return Asserts.success(requestId); } 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 9d19a22..e433613 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 @@ -78,7 +78,7 @@ public interface TerminalPhotoService { ServiceBody selectPhotoTime(TerminalReqPhotoTimeVo vo); - ServiceBody selectPhotoTimeGet(TerminalReqPhotoTimeVo vo); + ServiceBody selectPhotoTimeGet(TerminalPhotoTimeGetVo vo);