From 3f537500dcaaf786c7c51e88279e9d87fddfb872 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 15:03:29 +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/service/impl/TbTowerServiceImpl.java       |  2 +-
 .../bonus/digitalSignage/basic/vo/TbThreeSpanVo.java | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

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
index b0eeb48..20bad51 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java
@@ -143,7 +143,7 @@ public class TbTowerServiceImpl implements TbTowerService {
     public ServerResponse delTbTower(TbTowerVo data) {
         try {
             tbTowerMapper.delTbTower(data);
-            return ServerResponse.createSuccess("杆塔管理-删除失败");
+            return ServerResponse.createSuccess("杆塔管理-删除成功");
         } catch (Exception e) {
             log.error(e.toString(), e);
             return ServerResponse.createErroe("杆塔管理-删除失败");
diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java
index 7061a5c..f13f8d5 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.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 TbThreeSpanVo {
     /**
      * 跨越类型 1.跨线路 2.跨公路 3.跨铁路
      */
+    @Excel(name = "跨越类型", sort =3,readConverterExp = "1=跨线路,2=跨公路,2=跨铁路")
     private String spanType;
 
     /**
@@ -34,6 +36,7 @@ public class TbThreeSpanVo {
     /**
      * 开始杆塔名称
      */
+    @Excel(name = "开始杆塔名称", sort =1 )
     private String towerName;
 
     /**
@@ -44,46 +47,55 @@ public class TbThreeSpanVo {
     /**
      * 结束杆塔名称
      */
+    @Excel(name = "结束杆塔名称", sort =2)
     private String nextTowerName;
 
     /**
      * 上层线路
      */
+    @Excel(name = "上层线路", sort =4)
     private String upperLine;
 
     /**
      * 下层线路
      */
+    @Excel(name = "下层线路", sort =5)
     private String lowerLine;
 
     /**
      * 交叉角度
      */
+    @Excel(name = "交叉角度", sort =6)
     private String intersectionAngle;
 
     /**
      * 垂直距离（m）
      */
+    @Excel(name = "垂直距离（m）", sort =7)
     private String verticalDistance;
 
     /**
      * 安全裕度（°）
      */
+    @Excel(name = "安全裕度（°）", sort =8)
     private String safetyMargin;
 
     /**
      * 垂直净距（m）
      */
+    @Excel(name = "垂直净距（m）", sort =9)
     private String verticalClearDistance;
 
     /**
      * 杆塔间距（m）
      */
+    @Excel(name = "杆塔间距（m）", sort =10)
     private String towerSpacing;
 
     /**
      * 公路宽度（m）
      */
+    @Excel(name = "公路宽度（m）", sort =11)
     private String highwayWidth;
 
     /**