bonus
/
gz_digital_signage
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug修复

This commit is contained in:
马三炮 2025-05-09 17:29:44 +08:00
parent 68948fbcd6
commit 2cd42f828b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java
View File

@ -15,5 +15,5 @@ public interface TbCablewaTransMapper {
void delTbCablewaTrans(TbCablewaTransVo data);
TbCablewaTransVo getTbCablewaTransByTowerId(Long towerId);
List<TbCablewaTransVo> getTbCablewaTransByTowerId(Long towerId);
}

10
src/main/java/com/bonus/digitalSignage/basic/service/impl/TbTowerServiceImpl.java
View File

@ -118,12 +118,12 @@ public class TbTowerServiceImpl implements TbTowerService {
return ServerResponse.createErroe("请输入正确经纬度");
}
TbTowerVo tbTower = tbTowerMapper.getTbTowerBySort(data);
if (StringUtils.isNotNull(tbTower) && data.getId()!=tbTower.getId()){
if (StringUtils.isNotNull(tbTower) && !data.getId().equals(tbTower.getId())){
return ServerResponse.createErroe("排序已存在");
}
List<TbThreeSpanVo> tbThreeSpanVo = tbThreeSpanMapper.getTbThreeSpanByTowerId(data.getId());
TbCablewaTransVo tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId());
if(tbThreeSpanVo.size()>0 || tbCablewaTransVo!=null){
List<TbCablewaTransVo> tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId());
if(tbThreeSpanVo.size()>0 || tbCablewaTransVo.size()>0){
return ServerResponse.createErroe("修改失败-已有三跨点和索道点的杆塔不允许删除和修改");
}
//如果改变杆塔类型，先删后加
@ -161,8 +161,8 @@ public class TbTowerServiceImpl implements TbTowerService {
public ServerResponse delTbTower(TbTowerVo data) {
try {
List<TbThreeSpanVo> tbThreeSpanVo = tbThreeSpanMapper.getTbThreeSpanByTowerId(data.getId());
TbCablewaTransVo tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId());
if(tbThreeSpanVo.size()>0 || tbCablewaTransVo!=null){
List<TbCablewaTransVo> tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransByTowerId(data.getId());
if(tbThreeSpanVo.size()>0 || tbCablewaTransVo.size()>0){
return ServerResponse.createErroe("删除失败-已有三跨点和索道点的杆塔不允许删除和修改");
}
tbTowerMapper.delTbTower(data);

2
src/main/resources/mappers/basic/TbCablewaTransMapper.xml
View File

@ -67,6 +67,6 @@
select tct.id as id,tct.pro_id as proId,tct.tower_id as towerId,tct.cableway_length as cablewayLength,
tct.max_height as maxHeight,tct.safety_distance as safetyDistance,tct.max_slope as maxSlope,
tct.create_user_id as createUserId
from tb_cablewa_trans tct where tct.tower_id = #{towerId}
from tb_cablewa_trans tct where tct.tower_id = #{towerId} and tct.is_active='1'
</select>
</mapper>