图片轮询接口

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<TerminalPhoto> getReturnedPhoto(@RequestParam("termId")String termId) {
+    public ResponseReult<TerminalPhoto> getReturnedPhoto(@RequestParam("termId") String termId) {
         ServiceBody<TerminalPhoto> 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<TerminalPhotosModel> getPhotoBanner(@RequestBody @Validated PageVo vo) {
+        ServiceBody<TerminalPhotosModel> serviceBody = terminalPhotoService.getPhotoBanner(vo);
+        if (serviceBody.getCode() == ServiceStatus.SUCCESS) {
+            return ResponseReult.success(serviceBody.getData());
+        } else {
+            return ResponseReult.error(serviceBody.getCode(), serviceBody.getMsg());
+        }
+    }
+
 }

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/

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

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<TerminalPhoto> selectPhotos();
 }

xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml

@@ -33,6 +33,13 @@
         order by photo_time desc
     </select>
 
+    <select id="selectPhotos" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from terminal_photos
+        order by photo_time desc
+    </select>
+
     <select id="getLatestPhoto" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List"/>

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

@@ -2,11 +2,15 @@ package com.shxy.xymanager_service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
+import com.github.pagehelper.PageInfo;
 import com.shxy.xymanager_common.bean.ServiceBody;
 import com.shxy.xymanager_common.entity.TerminalPhoto;
 import com.shxy.xymanager_common.exception.Asserts;
 import com.shxy.xymanager_common.model.TerminalPhotoListModel;
+import com.shxy.xymanager_common.model.TerminalPhotosModel;
+import com.shxy.xymanager_common.page.PageUtils;
 import com.shxy.xymanager_common.util.MyDateUtils;
+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_dao.dao.TerminalPhotoDao;
@@ -38,6 +42,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     @Value("${cma.port}")
     private int port;
 
+    @Value("${photo.address}")
+    private String photoaddress;
+
 
     /**
      * 根据装置id和通道id获取图片
@@ -67,7 +74,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                 photoBean.setFileSize(item.getFileSize());
                 photoBean.setHeight(item.getHeight());
                 photoBean.setManualRequest(item.getManualRequest());
-                photoBean.setPath("http://47.96.238.157/photos/"+item.getPath());
+                photoBean.setPath(photoaddress + item.getPath());
                 photoBean.setId(item.getId());
                 photoBean.setTermId(item.getTermId());
                 photoBean.setWidth(item.getWidth());
@@ -85,9 +92,9 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
 
     @Override
     public ServiceBody<Boolean> getLatestPhoto(TerminalPhotoVo vo) {
-        Cma cma = new Cma(server,port);
-        Boolean hasNew = cma.requestCapture(vo.getCmdid(),vo.getChannel(),vo.getPreset(),vo.getCaptureType());
-        return  Asserts.success(hasNew);
+        Cma cma = new Cma(server, port);
+        Boolean hasNew = cma.requestCapture(vo.getCmdid(), vo.getChannel(), vo.getPreset(), vo.getCaptureType());
+        return Asserts.success(hasNew);
     }
 
     @Override
@@ -96,4 +103,54 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
         return Asserts.success(photo);
     }
 
+    /**
+     * 图片轮询接口
+     *
+     * @param vo
+     * @return
+     */
+    @Override
+    public ServiceBody<TerminalPhotosModel> getPhotoBanner(PageVo vo) {
+        TerminalPhotosModel model = new TerminalPhotosModel();
+        int pageindex = vo.getPageindex();
+        int pagesize = vo.getPagesize();
+        PageUtils.SetPage(pageindex, pagesize);
+        List<TerminalPhoto> list = terminalPhotoDao.selectPhotos();
+        boolean empty = CollectionUtil.isEmpty(list);
+        if (empty) {
+            model.setList(new ArrayList<>());
+        } else {
+            List<TerminalPhotosModel.PhotosBean> beans = new ArrayList<>();
+            for (TerminalPhoto item : list) {
+                TerminalPhotosModel.PhotosBean photoBean = new TerminalPhotosModel.PhotosBean();
+                photoBean.setChannelId(item.getChannelId());
+                photoBean.setFileSize(item.getFileSize());
+                photoBean.setHeight(item.getHeight());
+                photoBean.setManualRequest(item.getManualRequest());
+                photoBean.setPath(photoaddress + item.getPath());
+                photoBean.setId(item.getId());
+                photoBean.setTermId(item.getTermId());
+                photoBean.setWidth(item.getWidth());
+                photoBean.setPresetId(item.getPresetId());
+                BigInteger phototime = MyDateUtils.TimeSecond2MillSecond(item.getPhotoTime().longValue());
+                photoBean.setPhotoTime(MyDateUtils.date(phototime.longValue()));
+                BigInteger rectime = MyDateUtils.TimeSecond2MillSecond(item.getRecvTime().longValue());
+                photoBean.setRecvTime(MyDateUtils.date(rectime.longValue()));
+                beans.add(photoBean);
+            }
+            model.setList(beans);
+        }
+        PageInfo pageData = PageUtils.getPageData(list);
+        int currentpage = pageData.getPageNum();
+        model.setCurrentpage(currentpage);
+        long total = pageData.getTotal();
+        model.setTotal(total);
+
+        int pageSize = pageData.getPageSize();
+        model.setPagesize(pageSize);
+        int pages = pageData.getPages();
+        model.setTotalpage(pages);
+        return Asserts.success(model);
+    }
+
 }

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

@@ -3,6 +3,8 @@ package com.shxy.xymanager_service.service;
 import com.shxy.xymanager_common.bean.ServiceBody;
 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;
 
@@ -34,4 +36,11 @@ public interface TerminalPhotoService {
      */
     ServiceBody<TerminalPhoto> getReturnedPhoto(String termId);
 
+    /**
+     * 图片轮询接口
+     *
+     * @return
+     */
+    ServiceBody<TerminalPhotosModel> getPhotoBanner(PageVo vo);
+
 }