From 46f3a7fdbf19dbde0af1fb260c7fd65aeaab514f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Tue, 29 Apr 2025 10:13:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TbCablewaTransServiceImpl.java | 4 +-- .../service/impl/TbSpanTowerServiceImpl.java | 1 - .../service/impl/TbTowerServiceImpl.java | 28 +++++++++++-------- .../resources/mappers/basic/TbTowerMapper.xml | 2 +- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java index 1cedf57..5f59b7c 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java @@ -104,10 +104,10 @@ public class TbCablewaTransServiceImpl implements TbCablewaTransService { public ServerResponse delTbCablewaTrans(TbCablewaTransVo data) { try { tbCablewaTransMapper.delTbCablewaTrans(data); - return ServerResponse.createBySuccessMsg("索道运输-修改成功"); + return ServerResponse.createBySuccessMsg("索道运输-删除成功"); } catch (Exception e) { log.error(e.toString(), e); - return ServerResponse.createErroe("索道运输-修改失败"); + return ServerResponse.createErroe("索道运输-删除失败"); } } diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbSpanTowerServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbSpanTowerServiceImpl.java index 3b702f9..ec69557 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbSpanTowerServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbSpanTowerServiceImpl.java @@ -3,7 +3,6 @@ package com.bonus.digitalSignage.basic.service.impl; import com.bonus.digitalSignage.basic.dao.TbSpanTowerMapper; import com.bonus.digitalSignage.basic.service.TbSpanTowerService; import com.bonus.digitalSignage.basic.vo.TbSpanTowerVo; -import com.bonus.digitalSignage.utils.ServerResponse; import com.bonus.digitalSignage.utils.StrUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; 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 97171ae..d59f1ea 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 @@ -113,19 +113,25 @@ public class TbTowerServiceImpl implements TbTowerService { if (StringUtils.isNotNull(tbTower) && data.getId()!=tbTower.getId()){ return ServerResponse.createErroe("排序已存在"); } - //判断新增塔杆的坐标系 1.WGS-84地心坐标系 2.2000国家大地坐标系 - if ("1".equals(data.getUploadType())){ - double[] bd09 =CoordinateConverter.wgs84ToBd09(Double.parseDouble(data.getLat()),Double.parseDouble(data.getLon())); - data.setBaiduLat(String.valueOf(bd09[0])); - data.setBaiduLon(String.valueOf(bd09[1])); + //如果改变杆塔类型，先删后加 + if (tbTower.getUploadType()!=data.getUploadType()){ + delTbTower(data); + addTbTower(data); }else { - double[] bd09 =CoordinateConverter.cgcs2000ToBd09(Double.parseDouble(data.getLat()),Double.parseDouble(data.getLon())); - data.setBaiduLat(String.valueOf(bd09[0])); - data.setBaiduLon(String.valueOf(bd09[1])); + //判断新增塔杆的坐标系 1.WGS-84地心坐标系 2.2000国家大地坐标系 + if ("1".equals(data.getUploadType())){ + double[] bd09 =CoordinateConverter.wgs84ToBd09(Double.parseDouble(data.getLat()),Double.parseDouble(data.getLon())); + data.setBaiduLat(String.valueOf(bd09[0])); + data.setBaiduLon(String.valueOf(bd09[1])); + }else { + double[] bd09 =CoordinateConverter.cgcs2000ToBd09(Double.parseDouble(data.getLat()),Double.parseDouble(data.getLon())); + data.setBaiduLat(String.valueOf(bd09[0])); + data.setBaiduLon(String.valueOf(bd09[1])); + } + Long userId = UserUtil.getLoginUser().getId(); + data.setUpdateUserId(userId); + tbTowerMapper.updateTbTower(data); } - Long userId = UserUtil.getLoginUser().getId(); - data.setUpdateUserId(userId); - tbTowerMapper.updateTbTower(data); return ServerResponse.createBySuccessMsg("杆塔管理-修改成功"); } catch (Exception e) { log.error(e.toString(), e); diff --git a/src/main/resources/mappers/basic/TbTowerMapper.xml b/src/main/resources/mappers/basic/TbTowerMapper.xml index b4f1c3a..4726426 100644 --- a/src/main/resources/mappers/basic/TbTowerMapper.xml +++ b/src/main/resources/mappers/basic/TbTowerMapper.xml @@ -70,6 +70,6 @@ select id as id,pro_id as proId,tower_name as towerName,lon as lon,lat as lat, baidu_lon as baiduLon,baidu_lat as baiduLat,sort as sort,central_meridian as centralMeridian, upload_type as uploadType - from tb_tower where pro_id = #{proId} and sort = #{sort} + from tb_tower where pro_id = #{proId} and sort = #{sort} and is_actvice ='1'