From 9f87cc433f53045796ae0387d16549752e992c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Wed, 7 May 2025 14:35:05 +0800 Subject: [PATCH] =?UTF-8?q?Bug=E4=BF=AE=E5=A4=8D,=E5=B7=B2=E6=9C=89?= =?UTF-8?q?=E4=B8=89=E8=B7=A8=E7=82=B9=E5=92=8C=E7=B4=A2=E9=81=93=E7=82=B9?= =?UTF-8?q?=E7=9A=84=E6=9D=86=E5=A1=94=E4=B8=8D=E5=85=81=E8=AE=B8=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=92=8C=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/dao/TbCablewaTransMapper.java | 2 ++ .../basic/dao/TbThreeSpanMapper.java | 2 ++ .../service/impl/TbTowerServiceImpl.java | 21 +++++++++++++++++++ .../mappers/basic/TbCablewaTransMapper.xml | 6 ++++++ .../mappers/basic/TbThreeSpanMapper.xml | 7 +++++++ .../basic/lineManagement/child/towerList.js | 4 ++-- 6 files changed, 40 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java b/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java index 1b090b9..209fbf2 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java +++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java @@ -14,4 +14,6 @@ public interface TbCablewaTransMapper { void updateTbCablewaTrans(TbCablewaTransVo data); void delTbCablewaTrans(TbCablewaTransVo data); + + TbCablewaTransVo getTbCablewaTransByTowerId(Long towerId); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/dao/TbThreeSpanMapper.java b/src/main/java/com/bonus/digitalSignage/basic/dao/TbThreeSpanMapper.java index 8784eb6..01e239f 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/dao/TbThreeSpanMapper.java +++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbThreeSpanMapper.java @@ -15,4 +15,6 @@ public interface TbThreeSpanMapper { void updateTbThreeSpan(TbThreeSpanVo data); void delTbThreeSpan(TbThreeSpanVo data); + + List getTbThreeSpanByTowerId(Long towerId); } 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 8b6af8f..82e4cd6 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 @@ -1,7 +1,11 @@ package com.bonus.digitalSignage.basic.service.impl; +import com.bonus.digitalSignage.basic.dao.TbCablewaTransMapper; +import com.bonus.digitalSignage.basic.dao.TbThreeSpanMapper; import com.bonus.digitalSignage.basic.dao.TbTowerMapper; import com.bonus.digitalSignage.basic.service.TbTowerService; +import com.bonus.digitalSignage.basic.vo.TbCablewaTransVo; +import com.bonus.digitalSignage.basic.vo.TbThreeSpanVo; import com.bonus.digitalSignage.basic.vo.TbTowerVo; import com.bonus.digitalSignage.utils.*; import com.bonus.digitalSignage.webResult.StringUtils; @@ -24,6 +28,13 @@ public class TbTowerServiceImpl implements TbTowerService { @Resource private TbTowerMapper tbTowerMapper; + @Resource + private TbThreeSpanMapper tbThreeSpanMapper; + + @Resource + private TbCablewaTransMapper tbCablewaTransMapper; + + /** * 杆塔管理-查询列表 * @param data @@ -110,6 +121,11 @@ public class TbTowerServiceImpl implements TbTowerService { if (StringUtils.isNotNull(tbTower) && data.getId()!=tbTower.getId()){ return ServerResponse.createErroe("排序已存在"); } + List tbThreeSpanVo = tbThreeSpanMapper.getTbThreeSpanByTowerId(data.getId()); + TbCablewaTransVo tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId()); + if(tbThreeSpanVo!=null || tbCablewaTransVo!=null){ + return ServerResponse.createErroe("修改失败-已有三跨点和索道点的杆塔不允许删除和修改"); + } //如果改变杆塔类型，先删后加 if (StringUtils.isNotNull(tbTower) && tbTower.getUploadType()!=data.getUploadType()){ delTbTower(data); @@ -144,6 +160,11 @@ public class TbTowerServiceImpl implements TbTowerService { @Override public ServerResponse delTbTower(TbTowerVo data) { try { + List tbThreeSpanVo = tbThreeSpanMapper.getTbThreeSpanByTowerId(data.getId()); + TbCablewaTransVo tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId()); + if(tbThreeSpanVo!=null || tbCablewaTransVo!=null){ + return ServerResponse.createErroe("删除失败-已有三跨点和索道点的杆塔不允许删除和修改"); + } tbTowerMapper.delTbTower(data); return ServerResponse.createBySuccessMsg("杆塔管理-删除成功"); } catch (Exception e) { diff --git a/src/main/resources/mappers/basic/TbCablewaTransMapper.xml b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml index 748bfb6..f2bec4d 100644 --- a/src/main/resources/mappers/basic/TbCablewaTransMapper.xml +++ b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml @@ -63,4 +63,10 @@ left join tb_tower tt on tct.tower_id = tt.id where tct.id = #{id} + diff --git a/src/main/resources/mappers/basic/TbThreeSpanMapper.xml b/src/main/resources/mappers/basic/TbThreeSpanMapper.xml index 070f66b..cc9170f 100644 --- a/src/main/resources/mappers/basic/TbThreeSpanMapper.xml +++ b/src/main/resources/mappers/basic/TbThreeSpanMapper.xml @@ -86,4 +86,11 @@ tower_spacing as towerSpacing,highway_width as highwayWidth from tb_three_span where id = #{id} + diff --git a/src/main/resources/static/js/basic/lineManagement/child/towerList.js b/src/main/resources/static/js/basic/lineManagement/child/towerList.js index e7399d2..0dc241f 100644 --- a/src/main/resources/static/js/basic/lineManagement/child/towerList.js +++ b/src/main/resources/static/js/basic/lineManagement/child/towerList.js @@ -175,7 +175,7 @@ function delData(id) { query() },1000) - } else if (result.code === 500) { + } else { layer.alert(result.msg, {icon: 2}) } }, function (xhr) { @@ -223,4 +223,4 @@ function importTower(){ 'proId':idParam } openIframe2("ropeway", '数据导入', "importTower.html", '1000px', '625px', param); -} \ No newline at end of file +}