From 2be8e81838cd0183f41074c28a5943b9d612e0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Sun, 27 Apr 2025 11:26:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E8=B7=A8=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    | 18 ++++++++++++++++++
 .../service/impl/TbProjectServiceImpl.java     | 10 ++++++++++
 .../digitalSignage/basic/vo/TbTowerVo.java     |  2 ++
 .../resources/mappers/basic/TbTowerMapper.xml  |  4 ++--
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java
index d791864..3f4ea38 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java
@@ -106,4 +106,22 @@ public class TbTowerController {
         ExcelUtil<TbTowerVo> util = new ExcelUtil<TbTowerVo>(TbTowerVo.class);
         util.exportExcel(response, tbTowerVoList, "杆塔管理");
     }
+
+    /**
+     * 杆塔管理-查询所有
+     * @param dto
+     * @return
+     */
+    @PostMapping(value = "getTbTowerAll")
+    @DecryptAndVerify(decryptedClass = TbTowerVo.class)//加解密统一管理
+    @LogAnnotation(operModul = "杆塔管理-查询所有", operation = "查询列表", operDesc = "系统级事件",operType="查询")
+    public ServerResponse getTbTowerAll(EncryptedReq<TbTowerVo> dto) {
+        try {
+            List<TbTowerVo> tbTowerVoList = tbTowerService.tbProjectExport(dto.getData());
+            return ServerResponse.createSuccess(tbTowerVoList);
+        } catch (Exception e) {
+            log.error(e.toString(), e);
+            return ServerResponse.createErroe("杆塔管理-查询所有");
+        }
+    }
 }
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 9959be7..0cbf1f8 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
@@ -3,8 +3,10 @@ package com.bonus.digitalSignage.basic.service.impl;
 import com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo;
 import com.bonus.digitalSignage.basic.dao.TbProjectMapper;
 import com.bonus.digitalSignage.basic.service.TbProjectService;
+import com.bonus.digitalSignage.basic.service.TbThreeSpanService;
 import com.bonus.digitalSignage.basic.service.TbTowerService;
 import com.bonus.digitalSignage.basic.vo.TbProjectVo;
+import com.bonus.digitalSignage.basic.vo.TbThreeSpanVo;
 import com.bonus.digitalSignage.basic.vo.TbTowerVo;
 import com.bonus.digitalSignage.utils.ServerResponse;
 import com.bonus.digitalSignage.utils.UserUtil;
@@ -33,6 +35,9 @@ public class TbProjectServiceImpl implements TbProjectService {
     @Resource
     private TbTowerService tbTowerService;
 
+    @Resource
+    private TbThreeSpanService tbThreeSpanService;
+
     /**
      * 线路工程管理-查询列表
      * @param data
@@ -44,12 +49,17 @@ public class TbProjectServiceImpl implements TbProjectService {
             //获取工程列表
             List<TbProjectVo> tbProjectVoList = tbProjectMapper.getTbProjectList(data);
             TbTowerVo tbTowerVo = new TbTowerVo();
+            TbThreeSpanVo tbThreeSpanVo = new TbThreeSpanVo();
             if (!tbProjectVoList.isEmpty()){
                 for (TbProjectVo tbProjectVo:tbProjectVoList) {
                     //获取工程下的杆塔列表
                     tbTowerVo.setProId(tbProjectVo.getId());
                     List<TbTowerVo> tbTowerVoList = tbTowerService.tbProjectExport(tbTowerVo);
                     tbProjectVo.setTbTowerVoList(tbTowerVoList);
+                    //获取工程下的三跨列表
+                    tbThreeSpanVo.setProId(tbProjectVo.getId());
+                    List<TbThreeSpanVo> tbThreeSpanVoList = tbThreeSpanService.tbProjectAll(tbThreeSpanVo);
+                    tbProjectVo.setTbThreeSpanVoList(tbThreeSpanVoList);
                 }
             }
             PageInfo<TbProjectVo> pageInfo = new PageInfo<>(tbProjectVoList);
diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java
index 1f5bf7e..2fa8b67 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbTowerVo.java
@@ -1,5 +1,6 @@
 package com.bonus.digitalSignage.basic.vo;
 
+import com.bonus.digitalSignage.utils.Excel;
 import lombok.Data;
 
 import java.util.Date;
@@ -24,6 +25,7 @@ public class TbTowerVo {
     /**
      * 杆塔名称
      */
+    @Excel(name = "杆塔号", sort = 1)
     private String towerName;
 
     /**
diff --git a/src/main/resources/mappers/basic/TbTowerMapper.xml b/src/main/resources/mappers/basic/TbTowerMapper.xml
index 994978b..616a5a4 100644
--- a/src/main/resources/mappers/basic/TbTowerMapper.xml
+++ b/src/main/resources/mappers/basic/TbTowerMapper.xml
@@ -15,7 +15,7 @@
             <if test="centralMeridian != null  ">central_meridian,</if>
             <if test="uploadType != null ">upload_type,</if>
             <if test="createTime != null">create_time,</if>
-            <if test="createUser != null ">create_user,</if>
+            <if test="createUserId != null ">create_user_id,</if>
             is_actvice
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -29,7 +29,7 @@
             <if test="centralMeridian != null ">#{centralMeridian},</if>
             <if test="uploadType != null ">#{uploadType},</if>
             <if test="createTime != null ">#{createTime},</if>
-            <if test="createUser != null ">#{createUser},</if>
+            <if test="createUserId != null ">#{createUserId},</if>
             1
         </trim>
     </insert>