From 91bff8ddfedf69b23d117755cd605959c4a8d6ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Mon, 28 Apr 2025 18:05:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=A2=E9=81=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TbThreeSpanServiceImpl.java  | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java
index 0e05a39..1b87549 100644
--- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java
+++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbThreeSpanServiceImpl.java
@@ -108,16 +108,25 @@ public class TbThreeSpanServiceImpl implements TbThreeSpanService {
     @Transactional
     public ServerResponse updateTbThreeSpan(TbThreeSpanVo data) {
         try {
-            Long userId = UserUtil.getLoginUser().getId();
-            data.setUpdateUserId(userId);
-            tbThreeSpanMapper.updateTbThreeSpan(data);
-            List<TbSpanTowerVo> tbSpanTowerList =data.getTbSpanTowerList();
-            //获取跨越杆塔信息
-            if (tbSpanTowerList!=null){
-                tbSpanTowerService.updateTbSpanTower(tbSpanTowerList,data.getId());
+            TbThreeSpanVo tbThreeSpan = tbThreeSpanMapper.getTbThreeSpanById(data);
+            //判断是否改变类型
+            if (tbThreeSpan.getSpanType()!=data.getSpanType()){
+                //如果改变类型，先删后加
+                delTbThreeSpan(data);
+                addTbThreeSpan(data);
+            }else {
+                Long userId = UserUtil.getLoginUser().getId();
+                data.setUpdateUserId(userId);
+                tbThreeSpanMapper.updateTbThreeSpan(data);
+                List<TbSpanTowerVo> tbSpanTowerList =data.getTbSpanTowerList();
+                //获取跨越杆塔信息
+                if (tbSpanTowerList!=null){
+                    tbSpanTowerService.delTbSpanTower(data.getId());
+                    tbSpanTowerService.addTbSpanTowerList(data.getId(),tbSpanTowerList);
+                }
             }
             return ServerResponse.createBySuccessMsg("三跨管理-修改成功");
-        } catch (Exception e) {
+        } catch (Throwable e) {
             log.error(e.toString(), e);
             return ServerResponse.createErroe("三跨管理-修改失败");
         }