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 55995ec..2b40d5c 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java @@ -41,4 +41,11 @@ public class DigitalSignageController { public ServerResponse getTowerProgressNum(EncryptedReq dto) { return service.getTowerProgressNum(dto.getData()); } + + @ApiOperation("电子看板-三跨数据") + @PostMapping(value = "getThreeSpans") + @DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理 + public ServerResponse getThreeSpans(EncryptedReq dto) { + return service.getThreeSpans(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 d9e7cbc..4010455 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/dao/DigitalSignageDao.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/dao/DigitalSignageDao.java @@ -42,4 +42,13 @@ public interface DigitalSignageDao { * @date 2025/4/24 13:59 */ int getRopewayTransNum(QueryParamDto dto); + + /** + * 电子看板-三跨数据 + * @param dto + * @return List + * @author cwchen + * @date 2025/4/24 14:50 + */ + List getThreeSpans(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 e9c872e..d90f54d 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 @@ -14,23 +14,99 @@ public class DigitalSignageVo { @Data public static class TowerProgressNumVo { - /**基础开挖*/ + /** + * 基础开挖 + */ private int num1; - /**开挖完成*/ + /** + * 开挖完成 + */ private int num2; - /**浇筑完成*/ + /** + * 浇筑完成 + */ private int num3; - /**铁塔组立*/ + /** + * 铁塔组立 + */ private int num4; - /**组塔完成*/ + /** + * 组塔完成 + */ private int num5; - /**架线完成*/ + /** + * 架线完成 + */ private int num6; - /**附件安装*/ + /** + * 附件安装 + */ private int num7; - /**未开始*/ + /** + * 未开始 + */ private int num8; - /**索道运输*/ + /** + * 索道运输 + */ private int num9; } + + @Data + public static class ThreeSpanVo { + + /** + * 跨越类型 1.跨线路 2.跨公路 3.跨铁路 + */ + private String spanType; + /** + * 开始杆塔id + */ + private Long towerId; + /** + * 结束杆塔id + */ + private String towerName; + /** + * 开始杆塔名称 + */ + private Long nextTowerId; + /** + * 结束杆塔名称 + */ + private String nextTowerName; + /** + * 上层线路 + */ + private String upperLine; + /** + * 下层线路 + */ + private String lowerLine; + /** + * 交叉角度 + */ + private String intersectionAngle; + /** + * 垂直距离(m) + */ + private String verticalDistance; + /** + * 安全裕度(°) + */ + private String safetyMargin; + /** + * 垂直净距(m) + */ + private String verticalClearDistance; + /** + * 杆塔间距(m) + */ + private String towerSpacing; + /** + * 公路宽度(m) + */ + private String highwayWidth; + + } } 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 e856d69..adc8a47 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java @@ -28,4 +28,13 @@ public interface DigitalSignageService { * @date 2025/4/24 13:52 */ ServerResponse getTowerProgressNum(QueryParamDto data); + + /** + * 电子看板-三跨数据 + * @param data + * @return ServerResponse + * @author cwchen + * @date 2025/4/24 14:48 + */ + ServerResponse getThreeSpans(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 3b2c062..fbe3590 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 @@ -78,4 +78,15 @@ public class DigitalSignageServiceImpl implements DigitalSignageService { } return ServerResponse.createSuccess(vo); } + + @Override + public ServerResponse getThreeSpans(QueryParamDto dto) { + List list = new ArrayList<>(); + try { + list = Optional.ofNullable(dao.getThreeSpans(dto)).orElseGet(ArrayList::new); + } catch (Exception e) { + log.error(e.toString(), e); + } + return ServerResponse.createSuccess(list); + } } diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml index 3f7dd7c..daa55f0 100644 --- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml +++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml @@ -60,4 +60,26 @@ FROM tb_cablewa_trans WHERE pro_id = #{id} AND is_active = '1' + +