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 0581f94..89da950 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 @@ -180,8 +180,8 @@ public class TerminalPhotoController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/updatePhotoParam") @Log(title = "图像采集参数设置", type = "查询") - public ResponseReult addOrUpdatePhotoParams(@RequestBody @Validated PhotoParamsVo vo) { - ServiceBody serviceBody = terminalPhotoService.addOrUpdatePhotoParams(vo); + public ResponseReult addOrUpdatePhotoParams(@RequestBody @Validated PhotoParamsVo vo) { + ServiceBody serviceBody = terminalPhotoService.addOrUpdatePhotoParams(vo); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java index 9550bcf..bae7cd5 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalModel.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.math.BigInteger; import java.util.Date; import java.util.List; @@ -41,7 +42,7 @@ public class TerminalModel implements Serializable { private String cmId; @ApiModelProperty(value = "工作状态更新时间", example = "123456") - private String wsUpdateTime; + private BigInteger wsUpdateTime; @ApiModelProperty(value = "是否最新", example = "123456") private Boolean isNew = false; 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 d8d63d8..6de6526 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 @@ -35,6 +35,7 @@ import com.shxy.xymanager_dao.dao.TerminalPhotoDao; import com.shxy.xymanager_dao.dao.TerminalsDao; import com.shxy.xymanager_service.service.TerminalPhotoService; import com.shxy.xymanager_service.service.TerminalScheduleRuleService; +import io.swagger.models.auth.In; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -405,13 +406,13 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { } @Override - public ServiceBody addOrUpdatePhotoParams(PhotoParamsVo vo) { + public ServiceBody addOrUpdatePhotoParams(PhotoParamsVo vo) { Integer result = terminalPhotoDao.updateOrInsertParams(vo); if (result>0) { - String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --cmdid=" + vo.getCmdId() + "\t" + "--color=" + vo.getColor() + "\t" + "--resolution=" + vo.getResolution() + "\t" - + "--luminance=" + vo.getLuminance() + "\t" + "-contrast=" + vo.getContrast() + "\t" + "--saturation=" + vo.getSaturation(); + String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --port=6891 --act=imgparams --clientid=10 --cmdid=" + vo.getCmdId() + "\t" + "--color=" + vo.getColor() + "\t" + "--resolution=" + vo.getResolution() + "\t" + + "--luminance=" + vo.getLuminance() + "\t" + "-contrast=" + vo.getContrast() + "\t" + "--saturation=" + vo.getSaturation()+ "\t" + "--reqid=" + Constants.REQUEST_ID; ProcessExecUtils.exec(cmd); - return Asserts.success("更新成功"); + return Asserts.success(Constants.REQUEST_ID.addAndGet(1)); } return Asserts.error("更新失败"); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index 2147629..e761607 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -203,7 +203,7 @@ public class TerminalServiceImpl implements TerminalService { public ServiceBody getTerminalStatus(Integer termId) { TerminalStatusGetModel model = new TerminalStatusGetModel(); String cmdId = terminalsDao.getCmdIdByTermId(termId); - String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --act=runningstatus --cmdid=" + cmdId+ "\t" + "--reqid=="+Constants.REQUEST_ID; + String cmd = "/usr/local/bin/xympadmn --server=127.0.0.1 --act=runningstatus --clientid=10 --cmdid=" + cmdId+ "\t" + "--reqid=="+Constants.REQUEST_ID; ProcessExecUtils.exec(cmd); /* TerminalModel model = new TerminalModel();*/ 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 e6eff87..8a43854 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 @@ -71,7 +71,7 @@ public interface TerminalPhotoService { */ ServiceBody getPhotoQueryParam(Integer termId); - ServiceBody addOrUpdatePhotoParams(PhotoParamsVo vo); + ServiceBody addOrUpdatePhotoParams(PhotoParamsVo vo); ServiceBody getLastedPhotoQueryParam(ReturnedPhotoParamsVo vo);