Merge branch 'master' of https://gitee.com/xinyingpower/xymanagerbackend

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<String> getPhotoQueryParamList(@RequestParam("termId") Integer termId) {
+    public ResponseReult<String> getPhotoQueryParamList(@RequestBody @Validated ReturnedPhotoParamsGetVo vo) {
-        ServiceBody<String> serviceBody = terminalPhotoService.getPhotoQueryParam(termId);
+        ServiceBody<String> serviceBody = terminalPhotoService.getPhotoQueryParam(vo);
         if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
             return ResponseReult.success(serviceBody.getData());
         } else {

xymanager_common/src/main/java/com/shxy/xymanager_common/vo/PhotoParamsVo.java

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 
 @Data
 @ApiModel(value = "图片采集参数对象", description = "图片采集参数对象")
-public class PhotoParamsVo extends PageVo{
+public class PhotoParamsVo{
     @ApiModelProperty(value = "装置编号", example = "123456")
     private Integer termId;
 
@@ -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;
 
 

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

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

@@ -393,9 +393,8 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     }
 
     @Override
-    public ServiceBody<String> getPhotoQueryParam(Integer termId) {
+    public ServiceBody<String> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo) {
-        String cmdId = terminalPhotoDao.selectCmdIdById(termId);
+        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();
-        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";
         ProcessExecUtils.exec(cmd);
      /*   TerminalPhotosParamsModel model = new TerminalPhotosParamsModel();
         PhotoParamsDto dto= terminalPhotoDao.selectPhotoParams(termId);

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

@@ -69,7 +69,7 @@ public interface TerminalPhotoService {
      *
      * @return
      */
-    ServiceBody<String> getPhotoQueryParam(Integer termId);
+    ServiceBody<String> getPhotoQueryParam(ReturnedPhotoParamsGetVo vo);
 
     ServiceBody<Integer> addOrUpdatePhotoParams(PhotoParamsVo vo);