From 351c84f0028bea13c46d54e3b6ab5e7b3d62d058 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 25 Apr 2025 13:46:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/TbTowerController.java | 55 ++++++++++ .../basic/dao/TbTowerMapper.java | 11 ++ .../basic/service/TbTowerService.java | 20 ++++ .../service/impl/TbProjectServiceImpl.java | 1 + .../service/impl/TbTowerServiceImpl.java | 58 ++++++++++ .../digitalSignage/basic/vo/TbTowerVo.java | 101 ++++++++++++++++++ .../resources/mappers/basic/TbTowerMapper.xml | 17 +++ 7 files changed, 263 insertions(+) create mode 100644 src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java create mode 100644 src/main/java/com/bonus/digitalSignage/basic/dao/TbTowerMapper.java create mode 100644 src/main/java/com/bonus/digitalSignage/basic/service/TbTowerService.java create mode 100644 src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java create mode 100644 src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java create mode 100644 src/main/resources/mappers/basic/TbTowerMapper.xml diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java new file mode 100644 index 0000000..de0566f --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java @@ -0,0 +1,55 @@ +package com.bonus.digitalSignage.basic.controller; + +import com.bonus.digitalSignage.annotation.DecryptAndVerify; +import com.bonus.digitalSignage.annotation.LogAnnotation; +import com.bonus.digitalSignage.basic.service.TbTowerService; +import com.bonus.digitalSignage.basic.vo.TbProjectVo; +import com.bonus.digitalSignage.basic.vo.TbTowerVo; +import com.bonus.digitalSignage.system.vo.EncryptedReq; +import com.bonus.digitalSignage.utils.ServerResponse; +import com.github.pagehelper.PageHelper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 杆塔管理 + * @author 马三炮 + * @date 2025/4/25 + */ +@RestController +@RequestMapping("/tbTower") +@Slf4j +public class TbTowerController { + + @Resource + private TbTowerService tbTowerService; + + /** + * 杆塔管理-查询列表 + * @param dto + * @return + */ + @PostMapping(value = "getTbTowerList") + @DecryptAndVerify(decryptedClass = TbTowerVo.class)//加解密统一管理 + @LogAnnotation(operModul = "杆塔管理-查询列表", operation = "查询列表", operDesc = "系统级事件",operType="查询") + public ServerResponse getTbTowerList(EncryptedReq dto) { + PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize()); + return tbTowerService.getTbTowerList(dto.getData()); + } + + /** + * 杆塔管理-查询详情 + * @param dto + * @return + */ + @PostMapping(value = "getTbTowerById") + @DecryptAndVerify(decryptedClass = TbTowerVo.class)//加解密统一管理 + @LogAnnotation(operModul = "杆塔管理-查询列表", operation = "查询详情", operDesc = "系统级事件",operType="查询") + public ServerResponse getTbTowerById(EncryptedReq dto) { + return tbTowerService.getTbTowerById(dto.getData()); + } +} diff --git a/src/main/java/com/bonus/digitalSignage/basic/dao/TbTowerMapper.java b/src/main/java/com/bonus/digitalSignage/basic/dao/TbTowerMapper.java new file mode 100644 index 0000000..fa2eb89 --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbTowerMapper.java @@ -0,0 +1,11 @@ +package com.bonus.digitalSignage.basic.dao; + +import com.bonus.digitalSignage.basic.vo.TbTowerVo; + +import java.util.List; + +public interface TbTowerMapper { + List getTbProjectList(TbTowerVo data); + + TbTowerVo getTbTowerById(TbTowerVo data); +} diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/TbTowerService.java b/src/main/java/com/bonus/digitalSignage/basic/service/TbTowerService.java new file mode 100644 index 0000000..2a2e1aa --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/service/TbTowerService.java @@ -0,0 +1,20 @@ +package com.bonus.digitalSignage.basic.service; + +import com.bonus.digitalSignage.basic.vo.TbTowerVo; +import com.bonus.digitalSignage.utils.ServerResponse; + +public interface TbTowerService { + /** + * 杆塔管理-查询列表 + * @param data + * @return + */ + ServerResponse getTbTowerList(TbTowerVo data); + + /** + * 杆塔管理-查询详情 + * @param data + * @return + */ + ServerResponse getTbTowerById(TbTowerVo data); +} diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java index eb24b82..0054097 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java @@ -36,6 +36,7 @@ public class TbProjectServiceImpl implements TbProjectService { @Override public ServerResponse getTbProjectList(TbProjectVo data) { try { + List tbProjectVoList = tbProjectMapper.getTbProjectList(data); PageInfo pageInfo = new PageInfo<>(tbProjectVoList); return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java new file mode 100644 index 0000000..47deede --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java @@ -0,0 +1,58 @@ +package com.bonus.digitalSignage.basic.service.impl; + +import com.bonus.digitalSignage.basic.dao.TbTowerMapper; +import com.bonus.digitalSignage.basic.service.TbTowerService; +import com.bonus.digitalSignage.basic.vo.TbProjectVo; +import com.bonus.digitalSignage.basic.vo.TbTowerVo; +import com.bonus.digitalSignage.utils.ServerResponse; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/25 + */ +@Service +@Slf4j +public class TbTowerServiceImpl implements TbTowerService { + + @Resource + private TbTowerMapper tbTowerMapper; + + /** + * 杆塔管理-查询列表 + * @param data + * @return + */ + @Override + public ServerResponse getTbTowerList(TbTowerVo data) { + try { + List tbTowerVoList = tbTowerMapper.getTbProjectList(data); + PageInfo pageInfo = new PageInfo<>(tbTowerVoList); + return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("杆塔管理-查询列表失败"); + } + } + + /** + * 杆塔管理-查询详情 + * @param data + * @return + */ + @Override + public ServerResponse getTbTowerById(TbTowerVo data) { + try { + TbTowerVo tbTower = tbTowerMapper.getTbTowerById(data); + return ServerResponse.createSuccess(tbTower); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("杆塔管理-查询详情失败"); + } + } +} diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java new file mode 100644 index 0000000..1f5bf7e --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java @@ -0,0 +1,101 @@ +package com.bonus.digitalSignage.basic.vo; + +import lombok.Data; + +import java.util.Date; + +/** + * @author 马三炮 + * @date 2025/4/25 + */ +@Data +public class TbTowerVo { + + /** + * id + */ + private Long id; + + /** + * 工程id + */ + private Long proId; + + /** + * 杆塔名称 + */ + private String towerName; + + /** + * 工程名称 + */ + private String proName; + + /** + * 经度 + */ + private String lon; + + /** + * 经度 + */ + private String lat; + + /** + * 百度地图—经度 + */ + private String baiduLon; + + /** + * 百度地图—纬度 + */ + private String baiduLat; + + /** + * 排序 + */ + private Integer sort; + + /** + * 中央子午线 + */ + private String centralMeridian; + + /** + * 类型 1.WGS-84地心坐标系 2.2000国家大地坐标系 + */ + private String uploadType; + + /** + * 是否可用 1.可用 0.不可用 + */ + private String isActvice; + + /** + * 杆塔完成进度 1.基础开挖 2.基础开挖完成 3.基础浇筑完成 4.铁塔组立 5.铁塔组立完成 6.架线施工完成 7.附件安装完成（实时更新） + */ + private String towerProgress; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建时间 + */ + private Date updateTime; + + /** + * 创建人id + */ + private Long createUserId; + + /** + * 修改人id + */ + private Long updateUserId; + + private int pageNum = 1; + private int pageSize = 10; +} diff --git a/src/main/resources/mappers/basic/TbTowerMapper.xml b/src/main/resources/mappers/basic/TbTowerMapper.xml new file mode 100644 index 0000000..c3a5ad8 --- /dev/null +++ b/src/main/resources/mappers/basic/TbTowerMapper.xml @@ -0,0 +1,17 @@ + + + + + + + From 4411ed49cb007273ce4df2c4330365920d7e0e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Fri, 25 Apr 2025 13:59:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BA=BF=E8=B7=AF=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/vo/TbCablewaTransVo.java | 8 ++++++++ .../digitalSignage/basic/vo/TbProjectVo.java | 16 ++++++++++++++++ .../digitalSignage/basic/vo/TbThreeSpanVo.java | 8 ++++++++ 3 files changed, 32 insertions(+) create mode 100644 src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java create mode 100644 src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java new file mode 100644 index 0000000..a899bf9 --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java @@ -0,0 +1,8 @@ +package com.bonus.digitalSignage.basic.vo; + +/** + * @author 马三炮 + * @date 2025/4/25 + */ +public class TbCablewaTransVo { +} diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java index 005c8c5..3fbc9a7 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbProjectVo.java @@ -3,6 +3,7 @@ package com.bonus.digitalSignage.basic.vo; import lombok.Data; import java.util.Date; +import java.util.List; /** * @author 马三炮 @@ -101,6 +102,21 @@ public class TbProjectVo { */ private Long updateUserId; + /** + * 杆塔数量 + */ + private List tbTowerVoList; + + /** + * 三跨数量 + */ + private List tbThreeSpanVoList; + + /** + * 索道数量 + */ + private List tbCablewaTransVoList; + private int pageNum = 1; private int pageSize = 10; } diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java new file mode 100644 index 0000000..528aef9 --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java @@ -0,0 +1,8 @@ +package com.bonus.digitalSignage.basic.vo; + +/** + * @author 马三炮 + * @date 2025/4/25 + */ +public class TbThreeSpanVo { +}