From ba74f1914a90819a2532874802f00f2db263ec61 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Sat, 13 May 2023 16:49:38 +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 --- .../xymanager_admin/controller/TerminalGPSController.java | 8 ++++---- .../xymanager_common/model/TerminalPhotosParamsModel.java | 2 +- .../shxy/xymanager_common/vo/ReturnedPhotoParamsVo.java | 4 ++++ .../java/com/shxy/xymanager_common/vo/TerminalGpsVo.java | 3 +++ .../java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java | 3 ++- .../src/main/resources/mappers/TerminalPhotoDao.xml | 4 ++-- .../xymanager_service/impl/SystemConfigServiceImpl.java | 2 +- .../xymanager_service/impl/TerminalGpsServiceImpl.java | 3 ++- .../xymanager_service/impl/TerminalPhotoServiceImpl.java | 4 ++-- .../xymanager_service/service/TerminalGpsService.java | 2 +- 10 files changed, 22 insertions(+), 13 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java index 5a8ea40..4437d11 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/TerminalGPSController.java @@ -55,12 +55,12 @@ public class TerminalGPSController extends BaseController { } } - @ApiOperation(value = "轮询获取GPS位置", notes = "获取GPS位置接口", httpMethod = "POST") + @ApiOperation(value = "获取GPS位置触发", notes = "获取GPS位置触发接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getTermGPSPosition") - @Log(title = "轮询获取GPS位置", type = "查询") - public ResponseReult getReturnedTermGPS(@RequestBody @Validated TerminalGpsVo vo) { - ServiceBody serviceBody = terminalGpsService.getReturnedGPS(vo); + @Log(title = "获取GPS位置触发", type = "查询") + public ResponseReult getReturnedTermGPS(@RequestBody @Validated TerminalGpsVo vo) { + ServiceBody serviceBody = terminalGpsService.getReturnedGPS(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/TerminalPhotosParamsModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosParamsModel.java index 40fae6b..bea1c7b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosParamsModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosParamsModel.java @@ -21,7 +21,7 @@ public class TerminalPhotosParamsModel implements Serializable { private Integer termId; @ApiModelProperty(value = "通道编号", example = "123456") - private Integer channelId; + private Short channel; @ApiModelProperty(value = "色彩选择：0 为黑白，1 为彩色", example = "123456") private Integer color; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsVo.java index 94466cd..b4adb6b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/ReturnedPhotoParamsVo.java @@ -14,6 +14,10 @@ public class ReturnedPhotoParamsVo { @ApiModelProperty(value = "装置id", required = true, example = "A0001") private Integer termId; + @NotNull(message = "通道") + @ApiModelProperty(value = "通道", required = true, example = "A0001") + private Short channelId; + @ApiModelProperty(value = "手动拍照时间", required = true, example = "A0001") private Integer requestId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java index 31d5dd7..051eb08 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalGpsVo.java @@ -14,4 +14,7 @@ public class TerminalGpsVo { @ApiModelProperty(value = "查询时间", example = "123455") private DateTime queryTime; + + @ApiModelProperty(value = "装置ID", example = "123455") + private String cmdId; } diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java index 114bbf2..282259a 100644 --- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java +++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java @@ -5,6 +5,7 @@ import com.shxy.xymanager_common.dto.PhotoParamsDto; import com.shxy.xymanager_common.dto.TerminalPhotoScheduleDto; import com.shxy.xymanager_common.entity.TerminalPhoto; import com.shxy.xymanager_common.vo.PhotoParamsVo; +import com.shxy.xymanager_common.vo.ReturnedPhotoParamsVo; import com.shxy.xymanager_common.vo.TerminalPhotoTimeVo; import com.shxy.xymanager_common.vo.TerminalReqPhotoTimeVo; import org.apache.ibatis.annotations.Param; @@ -39,7 +40,7 @@ public interface TerminalPhotoDao { List selectPhotoSchedule(TerminalPhotoTimeVo vo); - PhotoParamsDto selectPhotoParams(Integer termId); + PhotoParamsDto selectPhotoParams(ReturnedPhotoParamsVo vo); String selectCmdIdById(Integer termId); diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 2915c6f..9f0603c 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -263,7 +263,7 @@ where id = #{id,jdbcType=BIGINT} - select tip.term_id termId, tip.color color, @@ -272,7 +272,7 @@ tip.saturation saturation, t.cmdid cmdId from terminal_img_params tip left join terminals t on tip.term_id = t.id - where tip.term_id = #{termId,jdbcType=INTEGER} + where tip.term_id = #{termId,jdbcType=INTEGER} and tip.channel_id = #{channelId,jdbcType=INTEGER}