From 69d1ccab4077d2e291f755043f86ed5edc45d5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=89=BF?= Date: Wed, 9 Oct 2024 10:49:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=9B=BE=E7=89=87=E8=BD=AE=E8=AF=A2?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=A0=87=E8=AE=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 2 +- .../model/TerminalPhotosModel.java | 5 +++ .../impl/TerminalPhotoServiceImpl.java | 33 ++++++++++++++++++- 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/xymanager_admin/src/main/resources/application-test.yml b/xymanager_admin/src/main/resources/application-test.yml index 3bc3123..c473ec9 100644 --- a/xymanager_admin/src/main/resources/application-test.yml +++ b/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 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 index 95d3060..c0ab394 100644 --- 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 @@ -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 alarmlist; + + @ApiModelProperty(value = "通道编号和名称", example = "213") + private List list; } @Data diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index 68dfb51..007c1e7 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/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 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 list = terminalChannelMapperDao.selectAllByPhotoTime(BigInteger.valueOf(l)); - List list = terminalChannelMapperDao.selectAllByPhotoTime(CommonStatus.EFFECTIVE.value() , vo.getChannelId()); + List list = terminalChannelMapperDao.selectAllByPhotoTime(CommonStatus.EFFECTIVE.value(), vo.getChannelId()); ArrayList photolist = new ArrayList<>(); List 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 coordinateList = new ArrayList<>(); + TerminalPhotoMarksExample example1 = new TerminalPhotoMarksExample(); + example1.createCriteria().andTermIdEqualTo(bean.getTermid()).andChannelIdEqualTo(bean.getChannelid()); + List terminalPhotoMarks = terminalPhotoMarksDao.selectByExample(example1); + if (CollectionUtil.isNotEmpty(terminalPhotoMarks)) { + TerminalPhotoMarks marks = terminalPhotoMarks.get(0); + TerminalPhotoMarkPathsExample example2 = new TerminalPhotoMarkPathsExample(); + example2.createCriteria().andMarkIdEqualTo(marks.getId()); + List 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);