From 1b97865905f31c209e209c35aabdca4087cf0a9d Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Sat, 6 May 2023 09:56:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=BD=AE=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TerminalPhotoController.java | 17 ++++- .../src/main/resources/application-test.yml | 3 +- .../model/TerminalPhotosModel.java | 65 +++++++++++++++++++ .../xymanager_dao/dao/TerminalPhotoDao.java | 4 +- .../resources/mappers/TerminalPhotoDao.xml | 7 ++ .../impl/TerminalPhotoServiceImpl.java | 65 +++++++++++++++++-- .../service/TerminalPhotoService.java | 9 +++ 7 files changed, 163 insertions(+), 7 deletions(-) create mode 100644 xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.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 8fa93da..a6ddfe3 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 @@ -7,6 +7,8 @@ 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.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.TerminalPhotoVo; import com.shxy.xymanager_service.service.TerminalPhotoService; @@ -76,7 +78,7 @@ public class TerminalPhotoController extends BaseController { @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/getReturnedPhoto") @Log(title = "最新图片查询", type = "查询") - public ResponseReult getReturnedPhoto(@RequestParam("termId")String termId) { + public ResponseReult getReturnedPhoto(@RequestParam("termId") String termId) { ServiceBody serviceBody = terminalPhotoService.getReturnedPhoto(termId); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); @@ -85,4 +87,17 @@ public class TerminalPhotoController extends BaseController { } } + @ApiOperation(value = "图片轮询", notes = "图片轮询接口", httpMethod = "POST") + @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) + @RequestMapping("/getPhotoBanner") + @Log(title = "图片轮询", type = "查询") + public ResponseReult getPhotoBanner(@RequestBody @Validated PageVo vo) { + ServiceBody serviceBody = terminalPhotoService.getPhotoBanner(vo); + if (serviceBody.getCode() == ServiceStatus.SUCCESS) { + return ResponseReult.success(serviceBody.getData()); + } else { + return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg()); + } + } + } diff --git a/xymanager_admin/src/main/resources/application-test.yml b/xymanager_admin/src/main/resources/application-test.yml index eb5d6c6..1ee936d 100644 --- a/xymanager_admin/src/main/resources/application-test.yml +++ b/xymanager_admin/src/main/resources/application-test.yml @@ -171,4 +171,5 @@ cma: upload: # path: file:/usr/local/home/manager/download/ path: C:\software\upload\ - +photo: + address: http://47.96.238.157/photos/ diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.java new file mode 100644 index 0000000..c66bbe7 --- /dev/null +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.java @@ -0,0 +1,65 @@ +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 TerminalPhotosModel 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 PhotosBean { + + @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_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 b767f40..79f4f82 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 @@ -24,5 +24,7 @@ public interface TerminalPhotoDao { int updateByPrimaryKey(TerminalPhoto record); - TerminalPhoto getLatestPhoto(@Param("termId")String termId); + TerminalPhoto getLatestPhoto(@Param("termId") String termId); + + List selectPhotos(); } \ 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 8cd7bf3..a47fb8f 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml @@ -33,6 +33,13 @@ order by photo_time desc + +