From 993dfeeaecd1431ccfcd2e3df4bccd573d5662f7 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 24 Apr 2025 14:07:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=B5=E5=AD=90=E7=9C=8B=E6=9D=BF-=E6=9D=86?= =?UTF-8?q?=E5=A1=94=E6=96=BD=E5=B7=A5=E8=BF=9B=E5=BA=A6=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DigitalSignageController.java | 10 ++++-- .../backstage/dao/DigitalSignageDao.java | 19 ++++++++++ .../backstage/entity/vo/DigitalSignageVo.java | 36 +++++++++++++++++++ .../service/DigitalSignageService.java | 9 +++++ .../impl/DigitalSignageServiceImpl.java | 16 +++++++++ .../backstage/DigitalSignageMapper.xml | 19 ++++++++++ 6 files changed, 106 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/bonus/digitalSignage/backstage/entity/vo/DigitalSignageVo.java 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 8881042..55995ec 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/controller/DigitalSignageController.java @@ -1,15 +1,12 @@ package com.bonus.digitalSignage.backstage.controller; import com.bonus.digitalSignage.annotation.DecryptAndVerify; -import com.bonus.digitalSignage.annotation.LogAnnotation; import com.bonus.digitalSignage.backstage.entity.dto.QueryParamDto; import com.bonus.digitalSignage.backstage.service.DigitalSignageService; import com.bonus.digitalSignage.system.vo.EncryptedReq; import com.bonus.digitalSignage.utils.ServerResponse; -import com.github.pagehelper.PageHelper; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,4 +34,11 @@ public class DigitalSignageController { public ServerResponse getProTree(EncryptedReq dto) { return service.getProTree(dto.getData()); } + + @ApiOperation("电子看板-杆塔施工进度数量") + @PostMapping(value = "getTowerProgressNum") + @DecryptAndVerify(decryptedClass = QueryParamDto.class)//加解密统一管理 + public ServerResponse getTowerProgressNum(EncryptedReq dto) { + return service.getTowerProgressNum(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 7657184..d9e7cbc 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/dao/DigitalSignageDao.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/dao/DigitalSignageDao.java @@ -1,6 +1,7 @@ package com.bonus.digitalSignage.backstage.dao; import com.bonus.digitalSignage.backstage.entity.dto.QueryParamDto; +import com.bonus.digitalSignage.backstage.entity.vo.DigitalSignageVo; import com.bonus.digitalSignage.backstage.entity.vo.ProTreeVo; import org.springframework.stereotype.Repository; @@ -23,4 +24,22 @@ public interface DigitalSignageDao { * @date 2025/4/24 10:49 */ List getProTree(QueryParamDto dto); + + /** + * 电子看板-杆塔施工进度数量 + * @param dto + * @return TowerProgressNumVo + * @author cwchen + * @date 2025/4/24 13:55 + */ + DigitalSignageVo.TowerProgressNumVo getTowerProgressNum(QueryParamDto dto); + + /** + * 查询索道运输数量 + * @param dto + * @return int + * @author cwchen + * @date 2025/4/24 13:59 + */ + int getRopewayTransNum(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 new file mode 100644 index 0000000..e9c872e --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/backstage/entity/vo/DigitalSignageVo.java @@ -0,0 +1,36 @@ +package com.bonus.digitalSignage.backstage.entity.vo; + +import lombok.Data; + +/** + * @className:DigitalSignageVo + * @author:cwchen + * @date:2025-04-24-13:41 + * @version:1.0 + * @description:电子看板-vo + */ +@Data +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; + } +} 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 2f8f5cf..e856d69 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/service/DigitalSignageService.java @@ -19,4 +19,13 @@ public interface DigitalSignageService { * @date 2025/4/24 10:39 */ ServerResponse getProTree(QueryParamDto data); + + /** + * 电子看板-杆塔施工进度数量 + * @param data + * @return ServerResponse + * @author cwchen + * @date 2025/4/24 13:52 + */ + ServerResponse getTowerProgressNum(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 c92d795..3b2c062 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 @@ -2,6 +2,8 @@ package com.bonus.digitalSignage.backstage.service.impl; import com.bonus.digitalSignage.backstage.dao.DigitalSignageDao; import com.bonus.digitalSignage.backstage.entity.dto.QueryParamDto; +import com.bonus.digitalSignage.backstage.entity.vo.DigitalSignageVo; +import com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo; import com.bonus.digitalSignage.backstage.entity.vo.ProTreeVo; import com.bonus.digitalSignage.backstage.service.DigitalSignageService; import com.bonus.digitalSignage.utils.ServerResponse; @@ -62,4 +64,18 @@ public class DigitalSignageServiceImpl implements DigitalSignageService { } return tree; } + + @Override + public ServerResponse getTowerProgressNum(QueryParamDto dto) { + DigitalSignageVo.TowerProgressNumVo vo = new DigitalSignageVo.TowerProgressNumVo(); + try { + vo = Optional.ofNullable(dao.getTowerProgressNum(dto)).orElseGet(DigitalSignageVo.TowerProgressNumVo::new); + // 查询索道运输数量 + int num = dao.getRopewayTransNum(dto); + vo.setNum9(num); + } catch (Exception e) { + log.error(e.toString(),e); + } + return ServerResponse.createSuccess(vo); + } } diff --git a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml index 2ac2a85..3f7dd7c 100644 --- a/src/main/resources/mappers/backstage/DigitalSignageMapper.xml +++ b/src/main/resources/mappers/backstage/DigitalSignageMapper.xml @@ -41,4 +41,23 @@ ) A + + + +