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 20bad51..5860cea 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 @@ -110,7 +110,7 @@ public class TbTowerServiceImpl implements TbTowerService { if(!StrUtil.isValidLongitude(Double.parseDouble(data.getLon())) || !StrUtil.isValidLatitude(Double.parseDouble(data.getLat()))){ return ServerResponse.createErroe("请输入正确经纬度"); } - TbTowerVo tbTower = tbTowerMapper.getTbTowerById(data); + TbTowerVo tbTower = tbTowerMapper.getTbTowerBySort(data); if (StringUtils.isNotNull(tbTower) && data.getId()!=tbTower.getId()){ return ServerResponse.createErroe("排序已存在"); } diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java index a899bf9..36e2641 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java @@ -1,8 +1,53 @@ package com.bonus.digitalSignage.basic.vo; +import lombok.Data; + +import java.util.Date; + /** * @author 马三炮 * @date 2025/4/25 */ +@Data public class TbCablewaTransVo { + + /** + * id + */ + private Long id; + + /** + * 工程id + */ + private Long proId; + + /** + * 索道所在杆塔位置 + */ + private Long towerId; + + /** + * 索道长度(km) + */ + private String cablewayLength; + + /** + * 最大载重(kg) + */ + private String maxHeight; + + /** + * 是否可用 1,可用 0.不可用 + */ + private String isActive; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建时间 + */ + private Date updateTime; } diff --git a/src/main/resources/mappers/basic/TbTowerMapper.xml b/src/main/resources/mappers/basic/TbTowerMapper.xml index 616a5a4..ce3b7e0 100644 --- a/src/main/resources/mappers/basic/TbTowerMapper.xml +++ b/src/main/resources/mappers/basic/TbTowerMapper.xml @@ -69,6 +69,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 id = #{id} and sort = #{sort} + from tb_tower where pro_id = #{proId} and sort = #{sort}