Merge remote-tracking branch 'origin/master'

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<TbTowerVo> 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<TbTowerVo> dto) {
+        return tbTowerService.getTbTowerById(dto.getData());
+    }
+}

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<TbTowerVo> getTbProjectList(TbTowerVo data);
+
+    TbTowerVo getTbTowerById(TbTowerVo data);
+}

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);
+}

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<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
             PageInfo<TbProjectVo> pageInfo = new PageInfo<>(tbProjectVoList);
             return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize());

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<TbTowerVo> tbTowerVoList = tbTowerMapper.getTbProjectList(data);
+            PageInfo<TbTowerVo> 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("杆塔管理-查询详情失败");
+        }
+    }
+}

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 {
+}

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<TbTowerVo> tbTowerVoList;
+
+    /**
+     * 三跨数量
+     */
+    private List<TbThreeSpanVo> tbThreeSpanVoList;
+
+    /**
+     * 索道数量
+     */
+    private List<TbCablewaTransVo> tbCablewaTransVoList;
+
     private int pageNum = 1;
     private int pageSize = 10;
 }

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 {
+}

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;
+}

src/main/resources/mappers/basic/TbTowerMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bonus.digitalSignage.basic.dao.TbTowerMapper">
+
+    <select id="getTbProjectList" resultType="com.bonus.digitalSignage.basic.vo.TbTowerVo">
+        select id as id,pro_id as proId,tower_name as towerName,lon as lon,lat as lat,
+               baidu_lon as baiduLon,baidu_lat as baiduLat,sort as sort,central_meridian as centralMeridian
+            from tb_tower where pro_id = #{proId} and is_actvice = '1'
+    </select>
+    <select id="getTbTowerById" resultType="com.bonus.digitalSignage.basic.vo.TbTowerVo">
+        select id as id,pro_id as proId,tower_name as towerName,lon as lon,lat as lat,
+               baidu_lon as baiduLon,baidu_lat as baiduLat,sort as sort,central_meridian as centralMeridian,
+               upload_type as uploadType
+        from tb_tower where id = #{id}
+    </select>
+</mapper>