From d6b87adcea5946019d981b0b6179cf04f2c161f4 Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Mon, 8 May 2023 10:44:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E7=9A=84bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalPhotoController.java | 16 ++++ .../controller/UploadController.java | 4 - xymanager_common/pom.xml | 5 ++ .../exception/GlobalExceptionHandler.java | 7 +- .../model/TerminalPhotoListForOpenModel.java | 67 +++++++++++++++++ .../vo/TerminalAndChannelIdAndTimeVo.java | 1 + .../vo/TerminalAndTimeForOpenVo.java | 36 +++++++++ .../xymanager_dao/dao/TerminalPhotoDao.java | 2 + .../resources/mappers/TerminalPhotoDao.xml | 9 +++ .../impl/LineServiceImpl.java | 14 ++-- .../impl/TerminalPhotoServiceImpl.java | 74 ++++++++++++++++--- .../impl/TerminalScheduleRuleServiceImpl.java | 20 +++-- .../impl/TowerServiceImpl.java | 14 ---- .../service/TerminalPhotoService.java | 9 +++ 14 files changed, 234 insertions(+), 44 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndTimeForOpenVo.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 26207ed..2b8de91 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 @@ -6,10 +6,12 @@ import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; import com.shxy.xymanager_common.entity.TerminalPhoto; +import com.shxy.xymanager_common.model.TerminalPhotoListForOpenModel; import com.shxy.xymanager_common.model.TerminalPhotoListModel; import com.shxy.xymanager_common.model.TerminalPhotosModel; import com.shxy.xymanager_common.vo.PageVo; import com.shxy.xymanager_common.vo.TerminalAndChannelIdAndTimeVo; +import com.shxy.xymanager_common.vo.TerminalAndTimeForOpenVo; import com.shxy.xymanager_common.vo.TerminalPhotoVo; import com.shxy.xymanager_service.service.TerminalPhotoService; import io.swagger.annotations.Api; @@ -25,6 +27,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; + @Api(value = "图片接口", tags = "图片接口相关") @RestController @Slf4j @@ -74,6 +77,19 @@ public class TerminalPhotoController extends BaseController { } } + @ApiOperation(value = "图片查询给第三方", notes = "图片查询给第三方", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getPhotoListForOpen") + @Log(title = "图片查询给第三方", type = "查询") + public ResponseReult getPhotoListForOpen(@RequestBody @Validated TerminalAndTimeForOpenVo vo) { + ServiceBody serviceBody = terminalPhotoService.getPhotoListForOpen(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + @ApiOperation(value = "最新图片查询", notes = "图片查询接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getReturnedPhoto") diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java index 22783a2..2a5853d 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/UploadController.java @@ -32,10 +32,6 @@ public class UploadController extends BaseController { @Autowired UploadService uploadService; - - - - @ApiOperation(value = "上传APK", notes = "上传APK接口", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/uploadApk") diff --git a/xymanager_common/pom.xml b/xymanager_common/pom.xml index 6ec040f..fbfa642 100644 --- a/xymanager_common/pom.xml +++ b/xymanager_common/pom.xml @@ -99,6 +99,11 @@ jna + + org.springframework.boot + spring-boot-starter-validation + + diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java index 566c4fa..5467147 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/exception/GlobalExceptionHandler.java @@ -1,6 +1,7 @@ package com.shxy.xymanager_common.exception; import com.shxy.xymanager_common.base.ResponseReult; +import org.springframework.validation.BindException; import org.springframework.validation.BindingResult; import org.springframework.validation.FieldError; import org.springframework.web.bind.MethodArgumentNotValidException; @@ -12,7 +13,7 @@ import java.sql.SQLException; /** * 全局异常处理 - * Created by macro on 2020/2/27. + * Created by 晶晶 on 2023/5/8. */ @ControllerAdvice public class GlobalExceptionHandler { @@ -54,7 +55,7 @@ public class GlobalExceptionHandler { // // @ResponseBody // @ExceptionHandler(value = BindException.class) -// public CommonResult handleValidException(BindException e) { +// public ResponseReult handleValidException(BindException e) { // BindingResult bindingResult = e.getBindingResult(); // String message = null; // if (bindingResult.hasErrors()) { @@ -63,6 +64,6 @@ public class GlobalExceptionHandler { // message = fieldError.getField()+fieldError.getDefaultMessage(); // } // } -// return CommonResult.validateFailed(message); +// return ResponseReult.error(message); // } } diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java new file mode 100644 index 0000000..74e117a --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java @@ -0,0 +1,67 @@ +package com.shxy.xymanager_common.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * 图片列表给第三方 + */ +@Data +@ApiModel(value = "图片列表第三方对象", description = "图片列表第三方对象信息") +public class TerminalPhotoListForOpenModel implements Serializable { + + @ApiModelProperty(value = "总记录数", example = "120") + private long total; + @ApiModelProperty(value = "总页数", example = "120") + private int totalpage; + @ApiModelProperty(value = "当前页", example = "1") + private int currentpage; + @ApiModelProperty(value = "每页记录数", example = "1") + private int pagesize; + + @ApiModelProperty(value = "照片对象", example = "[]") + private List list; + + @Data + public static class PhotoBean { + + @ApiModelProperty(value = "图片id", example = "12321") + private Long id; + + @ApiModelProperty(value = "装置编号", example = "123456") + private Integer termId; + + @ApiModelProperty(value = "通道编号", example = "123456") + private Integer channelId; + + @ApiModelProperty(value = "预置位编号", example = "123456") + private Integer presetId; + + @ApiModelProperty(value = "宽度", example = "123456") + private Integer width; + + @ApiModelProperty(value = "高度", example = "123456") + private Integer height; + + @ApiModelProperty(value = "大小", example = "123456") + private Integer fileSize; + + @ApiModelProperty(value = "拍照时间", example = "123456") + private Date photoTime; + + @ApiModelProperty(value = "接收时间", example = "123456") + private Date recvTime; + + @ApiModelProperty(value = "照片路径", example = "123456") + private String path; + + @ApiModelProperty(value = "拍照方式", example = "123456") + private Integer manualRequest; + + } +} diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdAndTimeVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdAndTimeVo.java index fd7b702..ccd1153 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdAndTimeVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndChannelIdAndTimeVo.java @@ -3,6 +3,7 @@ package com.shxy.xymanager_common.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.springframework.validation.annotation.Validated; import javax.validation.constraints.NotNull; import java.util.Date; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndTimeForOpenVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndTimeForOpenVo.java new file mode 100644 index 0000000..328f990 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalAndTimeForOpenVo.java @@ -0,0 +1,36 @@ +package com.shxy.xymanager_common.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel(value = "装置和查询时间提供给第三方", description = "装置和查询时间提供给第三方") +public class TerminalAndTimeForOpenVo { + + @NotNull(message = "装置编号不能缺少") + @ApiModelProperty(value = "装置编号", example = "123455") + private Integer terminalid; + + @NotEmpty(message = "查询开始时间不能缺少") + @ApiModelProperty(value = "查询开始时间", example = "123455") + private Date starttime; + + @NotEmpty(message = "查询结束时间不能缺少") + @ApiModelProperty(value = "查询结束时间", example = "123455") + private Date endtime; + + @Min(value = 1, message = "分页位置最小从1开始") + @ApiModelProperty(value = "分页位置从1开始", required = true, example = "1") + private int pageindex; + + @Min(value = 1, message = "分页大小最小为1") + @ApiModelProperty(value = "分页大小", required = true, example = "1") + private int pagesize; +} 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 79f4f82..98375d1 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 @@ -27,4 +27,6 @@ public interface TerminalPhotoDao { TerminalPhoto getLatestPhoto(@Param("termId") String termId); List selectPhotos(); + + List selectPhotoListForOpen(@Param("termId") Integer terminalid,@Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime); } \ No newline at end of file diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml index 398ffe2..5b05fcf 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -47,6 +47,15 @@ order by create_time desc limit 1 + + +