From 56f7c85d8548d85d4197140ff5c7ca3e3bafd619 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 25 Apr 2025 09:32:09 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=9C=8B=E6=9D=BF-=E4=B8=89?= =?UTF-8?q?=E8=B7=A8=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DigitalSignageController.java | 7 ++ .../backstage/dao/DigitalSignageDao.java | 18 +++++ .../backstage/entity/vo/DigitalSignageVo.java | 68 +++++++++++++++++++ .../service/DigitalSignageService.java | 9 +++ .../impl/DigitalSignageServiceImpl.java | 16 +++++ .../backstage/DigitalSignageMapper.xml | 27 ++++++++ 6 files changed, 145 insertions(+) diff --git a/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java b/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java index 2b40d5c..b0231f0 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java @@ -48,4 +48,11 @@ public class DigitalSignageController { public ServerResponse getThreeSpans(EncryptedReq dto) { return service.getThreeSpans(dto.getData()); } + + @ApiOperation("电子看板-杆塔坐标点信息（索道运输、交叉跨越）") + @PostMapping(value = "getTowersInfo") + @DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理 + public ServerResponse getTowersInfo(EncryptedReq dto) { + return service.getTowersInfo(dto.getData()); + } } diff --git a/src/main/java/com/bonus/digitalSignage/backstage/dao/DigitalSignageDao.java b/src/main/java/com/bonus/digitalSignage/backstage/dao/DigitalSignageDao.java index 4010455..791fc0a 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/dao/DigitalSignageDao.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/dao/DigitalSignageDao.java @@ -51,4 +51,22 @@ public interface DigitalSignageDao { * @date 2025/4/24 14:50 */ List getThreeSpans(QueryParamDto dto); + + /** + * 查询索道运输信息 + * @param dto + * @return Object + * @author cwchen + * @date 2025/4/24 17:02 + */ + List getCablewaTrans(QueryParamDto dto); + + /** + * 查询杆塔数据 + * @param dto + * @return List + * @author cwchen + * @date 2025/4/25 9:11 + */ + List getTowersInfo(QueryParamDto dto); } diff --git a/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/DigitalSignageVo.java b/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/DigitalSignageVo.java index d90f54d..4c7e5df 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/DigitalSignageVo.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/DigitalSignageVo.java @@ -1,7 +1,10 @@ package com.bonus.digitalSignage.backstage.entity.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import java.util.Date; + /** * @className:DigitalSignageVo * @author:cwchen @@ -109,4 +112,69 @@ public class DigitalSignageVo { private String highwayWidth; } + + @Data + public static class CablewaTransVo { + /** + * 索道所在杆塔位置 + */ + private String towerName; + /** + * 索道长度（km） + */ + private String cablewayLength; + /** + * 最大载重(kg) + */ + private String maxHeight; + /** + * 安全距离(m) + */ + private String safetyDistance; + /** + * 最大坡度(°) + */ + private String maxSlope; + /** + * 百度地图—经度 + */ + private String baiduLon; + /** + * 百度地图-纬度 + */ + private String baiduLat; + } + + @Data + public static class TowerInfoVo{ + /**杆塔名称*/ + private String towerName; + /**百度经度*/ + private String baiduLon; + /**百度纬度*/ + private String baiduLat; + /**基础开挖完成日期*/ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date time1; + /**基础开挖完成日期*/ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date time2; + /**基础浇筑完成日期*/ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date time3; + /**铁塔组立完成日期*/ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date time4; + /**铁塔组立完成日期*/ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date time5; + /**架线施工完成日期*/ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date time6; + /**附件安装日期完成日期*/ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date time7; + /**是否存在跨越 1.存在 0.不存在*/ + private int existSpan; + } } diff --git a/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java b/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java index adc8a47..8a31d57 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java @@ -37,4 +37,13 @@ public interface DigitalSignageService { * @date 2025/4/24 14:48 */ ServerResponse getThreeSpans(QueryParamDto data); + + /** + * 电子看板-杆塔坐标点信息（索道运输、交叉跨越） + * @param data + * @return ServerResponse + * @author cwchen + * @date 2025/4/24 16:52 + */ + ServerResponse getTowersInfo(QueryParamDto data); } diff --git a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java index fbe3590..77e8959 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/DigitalSignageServiceImpl.java @@ -89,4 +89,20 @@ public class DigitalSignageServiceImpl implements DigitalSignageService { } return ServerResponse.createSuccess(list); } + + @Override + public ServerResponse getTowersInfo(QueryParamDto dto) { + Map map = new HashMap<>(); + try { + // 查询索道运输信息 + List cablewaTransVos = Optional.ofNullable(dao.getCablewaTrans(dto)).orElseGet(ArrayList::new); + // 查询交叉跨越信息 + // 查询杆塔数据 + List towerInfoVos = Optional.ofNullable(dao.getTowersInfo(dto)).orElseGet(ArrayList::new); + map.put("cablewaTransVos", cablewaTransVos); + } catch (Exception e) { + log.error(e.toString(),e); + } + return ServerResponse.createSuccess(map); + } } diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml index daa55f0..1915d1d 100644 --- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml +++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml @@ -82,4 +82,31 @@ LEFT JOIN tb_tower tt2 ON tts.tower_id = tt2.id WHERE tts.pro_id = #{id} AND is_active = '1' + + + +