#20230510 欣影管理平台装置信息查询代码

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<Integer> selectPhotoTimeGet(@RequestBody @Validated TerminalReqPhotoTimeVo vo) {
+    public ResponseReult<Integer> selectPhotoTimeGet(@RequestBody @Validated TerminalPhotoTimeGetVo vo) {
         ServiceBody<Integer> serviceBody = terminalPhotoService.selectPhotoTimeGet(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());

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;
+
+
+
+}

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;
+
 
 }

xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java

@@ -418,7 +418,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
 
     @Override
     public ServiceBody<TerminalPhotosParamsModel> 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<Integer> 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<Integer> 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);
     }
 
 

xymanager_service/src/main/java/com/shxy/xymanager_service/service/TerminalPhotoService.java

@@ -78,7 +78,7 @@ public interface TerminalPhotoService {
 
     ServiceBody<TerminalScheduleRuleTimeListModel> selectPhotoTime(TerminalReqPhotoTimeVo vo);
 
-    ServiceBody<Integer> selectPhotoTimeGet(TerminalReqPhotoTimeVo vo);
+    ServiceBody<Integer> selectPhotoTimeGet(TerminalPhotoTimeGetVo vo);