feat:图片轮询返回数据增加图片标记

xymanager_admin/src/main/resources/application-test.yml

@@ -2,7 +2,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://192.168.1.190:3306/hunan_0916?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+    url: jdbc:mysql://192.168.1.190:3306/hunan_0905?allowMultiQueries=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
     password: 123456
     type: com.alibaba.druid.pool.DruidDataSource

xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.java

@@ -1,11 +1,13 @@
 package com.shxy.xymanager_common.model;
 
+import com.shxy.xymanager_common.dto.TermChannelCoordinateDto;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -86,6 +88,9 @@ public class TerminalPhotosModel implements Serializable {
 
         @ApiModelProperty(value = "告警列表", example = "123456")
         private List<TerminalPhotoListModel.AlarmItemBean> alarmlist;
+
+        @ApiModelProperty(value = "通道编号和名称", example = "213")
+        private List<TermChannelCoordinateDto> list;
     }
 
     @Data

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

@@ -72,6 +72,12 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
     @Autowired
     CacheService cacheService;
 
+    @Autowired
+    private TerminalPhotoMarksDao terminalPhotoMarksDao;
+
+    @Autowired
+    private TerminalPhotoMarkPathsDao terminalPhotoMarkPathsDao;
+
     // 记录主动拍照参数
     public static Map<String, TermChannelModel> termChannelModelMap = new HashMap<>();
 
@@ -548,7 +554,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
 //        DateTime dateTime = MyDateUtils.offsetDay(new Date(), -1);
 //        long l = MyDateUtils.TimeMillSecond2Second(dateTime);
 //        List<TerminalChannelMapper> list = terminalChannelMapperDao.selectAllByPhotoTime(BigInteger.valueOf(l));
-        List<TerminalChannelMapper> list = terminalChannelMapperDao.selectAllByPhotoTime(CommonStatus.EFFECTIVE.value() , vo.getChannelId());
+        List<TerminalChannelMapper> list = terminalChannelMapperDao.selectAllByPhotoTime(CommonStatus.EFFECTIVE.value(), vo.getChannelId());
         ArrayList<BigInteger> photolist = new ArrayList<>();
         List<TerminalPhotosModel.PhotosBean> beans = new ArrayList<>();
         if (CollectionUtil.isNotEmpty(list)) {
@@ -588,6 +594,31 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
                 }
             }
             beans = TerminalUtils.setPhotoList(requestIp, list, lineMap, termchannelMapMap, terminalMap, termchannelMap, towerMap, photoList, imgarlarmsList);
+            // 查询图片标记路径
+            if (CollectionUtil.isNotEmpty(beans)) {
+                for (TerminalPhotosModel.PhotosBean bean : beans) {
+                    ArrayList<TermChannelCoordinateDto> coordinateList = new ArrayList<>();
+                    TerminalPhotoMarksExample example1 = new TerminalPhotoMarksExample();
+                    example1.createCriteria().andTermIdEqualTo(bean.getTermid()).andChannelIdEqualTo(bean.getChannelid());
+                    List<TerminalPhotoMarks> terminalPhotoMarks = terminalPhotoMarksDao.selectByExample(example1);
+                    if (CollectionUtil.isNotEmpty(terminalPhotoMarks)) {
+                        TerminalPhotoMarks marks = terminalPhotoMarks.get(0);
+                        TerminalPhotoMarkPathsExample example2 = new TerminalPhotoMarkPathsExample();
+                        example2.createCriteria().andMarkIdEqualTo(marks.getId());
+                        List<TerminalPhotoMarkPaths> terminalPhotoMarkPaths = terminalPhotoMarkPathsDao.selectByExample(example2);
+                        for (TerminalPhotoMarkPaths item : terminalPhotoMarkPaths) {
+                            TermChannelCoordinateDto termChannelCoordinateDto = new TermChannelCoordinateDto();
+                            termChannelCoordinateDto.setX1(item.getX1());
+                            termChannelCoordinateDto.setX2(item.getX2());
+                            termChannelCoordinateDto.setY1(item.getY1());
+                            termChannelCoordinateDto.setY2(item.getY2());
+                            coordinateList.add(termChannelCoordinateDto);
+                        }
+                    }
+                    bean.setList(coordinateList);
+                }
+
+            }
         }
         model.setList(beans);
         PageInfo pageData = PageUtils.getPageData(list);