diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbCablewaTransController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbCablewaTransController.java new file mode 100644 index 0000000..12a5c6b --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbCablewaTransController.java @@ -0,0 +1,107 @@ +package com.bonus.digitalSignage.basic.controller; + +import com.bonus.digitalSignage.annotation.DecryptAndVerify; +import com.bonus.digitalSignage.annotation.LogAnnotation; +import com.bonus.digitalSignage.basic.service.TbCablewaTransService; +import com.bonus.digitalSignage.basic.vo.TbCablewaTransVo; +import com.bonus.digitalSignage.system.vo.EncryptedReq; +import com.bonus.digitalSignage.utils.ExcelUtil; +import com.bonus.digitalSignage.utils.ServerResponse; +import com.github.pagehelper.PageHelper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 索道运输 + * @author 马三炮 + * @date 2025/4/27 + */ +@RestController +@RequestMapping("/tbCablewaTrans") +@Slf4j +public class TbCablewaTransController { + + @Resource + private TbCablewaTransService tbCablewaTransService; + + /** + * 索道运输-查询列表 + * @param dto + * @return + */ + @PostMapping(value = "/tbCablewaTransList") + @DecryptAndVerify(decryptedClass = TbCablewaTransVo.class)//加解密统一管理 + @LogAnnotation(operModul = "杆塔管理-查询列表", operation = "查询列表", operDesc = "系统级事件",operType="查询") + public ServerResponse getTbTowerList(EncryptedReq dto) { + PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize()); + return tbCablewaTransService.tbCablewaTransList(dto.getData()); + } + + /** + * 索道运输-查询详情 + * @param dto + * @return + */ + @PostMapping(value = "/getTbCablewaTransById") + @DecryptAndVerify(decryptedClass = TbCablewaTransVo.class)//加解密统一管理 + @LogAnnotation(operModul = "索道运输-查询详情", operation = "查询详情", operDesc = "系统级事件",operType="查询") + public ServerResponse getTbCablewaTransById(EncryptedReq dto) { + return tbCablewaTransService.getTbCablewaTransById(dto.getData()); + } + + /** + * 索道运输-新增 + * @param dto + * @return + */ + @PostMapping(value = "/addTbCablewaTrans") + @DecryptAndVerify(decryptedClass = TbCablewaTransVo.class)//加解密统一管理 + @LogAnnotation(operModul = "索道运输-新增", operation = "新增", operDesc = "系统级事件",operType="查询") + public ServerResponse addTbCablewaTrans(EncryptedReq dto) { + return tbCablewaTransService.addTbCablewaTrans(dto.getData()); + } + + /** + * 索道运输-修改 + * @param dto + * @return + */ + @PostMapping(value = "/updateTbCablewaTrans") + @DecryptAndVerify(decryptedClass = TbCablewaTransVo.class)//加解密统一管理 + @LogAnnotation(operModul = "索道运输-修改", operation = "修改", operDesc = "系统级事件",operType="查询") + public ServerResponse updateTbCablewaTrans(EncryptedReq dto) { + return tbCablewaTransService.updateTbCablewaTrans(dto.getData()); + } + + /** + * 索道运输-删除 + * @param dto + * @return + */ + @PostMapping(value = "/delTbCablewaTrans") + @DecryptAndVerify(decryptedClass = TbCablewaTransVo.class)//加解密统一管理 + @LogAnnotation(operModul = "索道运输-删除", operation = "删除", operDesc = "系统级事件",operType="查询") + public ServerResponse delTbCablewaTrans(EncryptedReq dto) { + return tbCablewaTransService.delTbCablewaTrans(dto.getData()); + } + + /** + * 索道运输-导出 + * @param dto + * @return + */ + @PostMapping(value = "/delTbCablewaTrans") + @DecryptAndVerify(decryptedClass = TbCablewaTransVo.class)//加解密统一管理 + @LogAnnotation(operModul = "索道运输-导出", operation = "导出", operDesc = "系统级事件",operType="查询") + public void delTbCablewaTrans(HttpServletResponse response, EncryptedReq dto) { + List tbCablewaTransVoList = tbCablewaTransService.tbCablewaTransAll(dto.getData()); + ExcelUtil util = new ExcelUtil<>(TbCablewaTransVo.class); + util.exportExcel(response, tbCablewaTransVoList, "索道运输"); + } +} diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java index 721b9b8..dcb4a2e 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbProjectController.java @@ -2,16 +2,13 @@ package com.bonus.digitalSignage.basic.controller; import com.bonus.digitalSignage.annotation.DecryptAndVerify; import com.bonus.digitalSignage.annotation.LogAnnotation; -import com.bonus.digitalSignage.backstage.entity.dto.QueryParamDto; import com.bonus.digitalSignage.basic.service.TbProjectService; import com.bonus.digitalSignage.basic.vo.TbProjectVo; import com.bonus.digitalSignage.system.vo.EncryptedReq; import com.bonus.digitalSignage.utils.ExcelUtil; import com.bonus.digitalSignage.utils.ServerResponse; import com.github.pagehelper.PageHelper; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,6 +18,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; /** + * 线路工程 * @author 马三炮 * @date 2025/4/24 */ diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java index 16d20e0..6aaa64b 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java @@ -3,9 +3,7 @@ package com.bonus.digitalSignage.basic.controller; import com.bonus.digitalSignage.annotation.DecryptAndVerify; import com.bonus.digitalSignage.annotation.LogAnnotation; import com.bonus.digitalSignage.basic.service.TbThreeSpanService; -import com.bonus.digitalSignage.basic.vo.TbProjectVo; import com.bonus.digitalSignage.basic.vo.TbThreeSpanVo; -import com.bonus.digitalSignage.basic.vo.TbTowerVo; import com.bonus.digitalSignage.system.vo.EncryptedReq; import com.bonus.digitalSignage.utils.ExcelUtil; import com.bonus.digitalSignage.utils.ServerResponse; @@ -20,6 +18,7 @@ import javax.servlet.http.HttpServletResponse; import java.util.List; /** + * 三跨 * @author 马三炮 * @date 2025/4/25 */ diff --git a/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java index 3f4ea38..7331f5e 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbTowerController.java @@ -3,7 +3,6 @@ package com.bonus.digitalSignage.basic.controller; import com.bonus.digitalSignage.annotation.DecryptAndVerify; import com.bonus.digitalSignage.annotation.LogAnnotation; import com.bonus.digitalSignage.basic.service.TbTowerService; -import com.bonus.digitalSignage.basic.vo.TbProjectVo; import com.bonus.digitalSignage.basic.vo.TbTowerVo; import com.bonus.digitalSignage.system.vo.EncryptedReq; import com.bonus.digitalSignage.utils.ExcelUtil; diff --git a/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java b/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java new file mode 100644 index 0000000..1b090b9 --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbCablewaTransMapper.java @@ -0,0 +1,17 @@ +package com.bonus.digitalSignage.basic.dao; + +import com.bonus.digitalSignage.basic.vo.TbCablewaTransVo; + +import java.util.List; + +public interface TbCablewaTransMapper { + List tbCablewaTransList(TbCablewaTransVo data); + + TbCablewaTransVo getTbCablewaTransById(TbCablewaTransVo data); + + void addTbCablewaTrans(TbCablewaTransVo data); + + void updateTbCablewaTrans(TbCablewaTransVo data); + + void delTbCablewaTrans(TbCablewaTransVo data); +} diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/TbCablewaTransService.java b/src/main/java/com/bonus/digitalSignage/basic/service/TbCablewaTransService.java new file mode 100644 index 0000000..b490e5f --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/service/TbCablewaTransService.java @@ -0,0 +1,51 @@ +package com.bonus.digitalSignage.basic.service; + +import com.bonus.digitalSignage.basic.vo.TbCablewaTransVo; +import com.bonus.digitalSignage.utils.ServerResponse; + +import java.util.List; + +public interface TbCablewaTransService { + /** + * 索道运输-查询列表 + * @param data + * @return + */ + ServerResponse tbCablewaTransList(TbCablewaTransVo data); + + /** + * 索道运输-查询详情 + * @param data + * @return + */ + ServerResponse getTbCablewaTransById(TbCablewaTransVo data); + + /** + * 索道运输-新增 + * @param data + * @return + */ + ServerResponse addTbCablewaTrans(TbCablewaTransVo data); + + /** + * 索道运输-新增 + * @param data + * @return + */ + ServerResponse updateTbCablewaTrans(TbCablewaTransVo data); + + + /** + * 索道运输-删除 + * @param data + * @return + */ + ServerResponse delTbCablewaTrans(TbCablewaTransVo data); + + /** + * 索道运输-查询所有 + * @param data + * @return + */ + List tbCablewaTransAll(TbCablewaTransVo data); +} diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/TbThreeSpanService.java b/src/main/java/com/bonus/digitalSignage/basic/service/TbThreeSpanService.java index 5212f64..baf6500 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/TbThreeSpanService.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/TbThreeSpanService.java @@ -1,7 +1,6 @@ package com.bonus.digitalSignage.basic.service; import com.bonus.digitalSignage.basic.vo.TbThreeSpanVo; -import com.bonus.digitalSignage.basic.vo.TbTowerVo; import com.bonus.digitalSignage.utils.ServerResponse; import java.util.List; 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 new file mode 100644 index 0000000..7edc071 --- /dev/null +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbCablewaTransServiceImpl.java @@ -0,0 +1,119 @@ +package com.bonus.digitalSignage.basic.service.impl; + +import com.bonus.digitalSignage.basic.dao.TbCablewaTransMapper; +import com.bonus.digitalSignage.basic.service.TbCablewaTransService; +import com.bonus.digitalSignage.basic.vo.TbCablewaTransVo; +import com.bonus.digitalSignage.utils.ServerResponse; +import com.bonus.digitalSignage.utils.UserUtil; +import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; + +/** + * @author 马三炮 + * @date 2025/4/27 + */ +@Service +@Slf4j +public class TbCablewaTransServiceImpl implements TbCablewaTransService { + + @Resource + private TbCablewaTransMapper tbCablewaTransMapper; + + /** + * 索道运输-查询列表 + * @param data + * @return + */ + @Override + public ServerResponse tbCablewaTransList(TbCablewaTransVo data) { + try { + List tbCablewaTransVoList = tbCablewaTransMapper.tbCablewaTransList(data); + PageInfo pageInfo = new PageInfo<>(tbCablewaTransVoList); + return ServerResponse.createSuccessPage(pageInfo, data.getPageNum(), data.getPageSize()); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("索道运输-查询列表失败"); + } + } + + + /** + * 索道运输-查询详情 + * @param data + * @return + */ + @Override + public ServerResponse getTbCablewaTransById(TbCablewaTransVo data) { + try { + TbCablewaTransVo tbCablewaTransVo = tbCablewaTransMapper.getTbCablewaTransById(data); + return ServerResponse.createSuccess(tbCablewaTransVo); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("索道运输-查询详情失败"); + } + } + + /** + * 索道运输-新增 + * @param data + * @return + */ + @Override + public ServerResponse addTbCablewaTrans(TbCablewaTransVo data) { + try { + Long userId = UserUtil.getLoginUser().getId(); + data.setCreateUserId(userId); + data.setCreateTime(new Date()); + tbCablewaTransMapper.addTbCablewaTrans(data); + return ServerResponse.createSuccess("索道运输-新增成功"); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("索道运输-新增失败"); + } + } + + /** + * 索道运输-新增 + * @param data + * @return + */ + @Override + public ServerResponse updateTbCablewaTrans(TbCablewaTransVo data) { + try { + Long userId = UserUtil.getLoginUser().getId(); + data.setUpdateUserId(userId); + tbCablewaTransMapper.updateTbCablewaTrans(data); + return ServerResponse.createSuccess("索道运输-修改成功"); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("索道运输-修改失败"); + } + } + + /** + * 索道运输-删除 + * @param data + * @return + */ + @Override + public ServerResponse delTbCablewaTrans(TbCablewaTransVo data) { + try { + tbCablewaTransMapper.delTbCablewaTrans(data); + return ServerResponse.createSuccess("索道运输-修改成功"); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("索道运输-修改失败"); + } + } + + @Override + public List tbCablewaTransAll(TbCablewaTransVo data) { + List tbCablewaTransVoList = tbCablewaTransMapper.tbCablewaTransList(data); + return tbCablewaTransVoList; + } +} diff --git a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java index 0cbf1f8..5c011be 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/impl/TbProjectServiceImpl.java @@ -1,10 +1,11 @@ package com.bonus.digitalSignage.basic.service.impl; -import com.bonus.digitalSignage.backstage.entity.vo.ProProgressVo; import com.bonus.digitalSignage.basic.dao.TbProjectMapper; +import com.bonus.digitalSignage.basic.service.TbCablewaTransService; import com.bonus.digitalSignage.basic.service.TbProjectService; import com.bonus.digitalSignage.basic.service.TbThreeSpanService; import com.bonus.digitalSignage.basic.service.TbTowerService; +import com.bonus.digitalSignage.basic.vo.TbCablewaTransVo; import com.bonus.digitalSignage.basic.vo.TbProjectVo; import com.bonus.digitalSignage.basic.vo.TbThreeSpanVo; import com.bonus.digitalSignage.basic.vo.TbTowerVo; @@ -16,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Optional; @@ -38,6 +38,9 @@ public class TbProjectServiceImpl implements TbProjectService { @Resource private TbThreeSpanService tbThreeSpanService; + @Resource + private TbCablewaTransService tbCablewaTransService; + /** * 线路工程管理-查询列表 * @param data @@ -50,6 +53,7 @@ public class TbProjectServiceImpl implements TbProjectService { List tbProjectVoList = tbProjectMapper.getTbProjectList(data); TbTowerVo tbTowerVo = new TbTowerVo(); TbThreeSpanVo tbThreeSpanVo = new TbThreeSpanVo(); + TbCablewaTransVo tbCablewaTransVo = new TbCablewaTransVo(); if (!tbProjectVoList.isEmpty()){ for (TbProjectVo tbProjectVo:tbProjectVoList) { //获取工程下的杆塔列表 @@ -60,6 +64,10 @@ public class TbProjectServiceImpl implements TbProjectService { tbThreeSpanVo.setProId(tbProjectVo.getId()); List tbThreeSpanVoList = tbThreeSpanService.tbProjectAll(tbThreeSpanVo); tbProjectVo.setTbThreeSpanVoList(tbThreeSpanVoList); + //获取工程下的索道运输 + tbCablewaTransVo.setProId(tbProjectVo.getId()); + List tbCablewaTransVoList = tbCablewaTransService.tbCablewaTransAll(tbCablewaTransVo); + tbProjectVo.setTbCablewaTransVoList(tbCablewaTransVoList); } } PageInfo pageInfo = new PageInfo<>(tbProjectVoList); 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 aaadd44..9e3e5b3 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 @@ -1,14 +1,10 @@ package com.bonus.digitalSignage.basic.service.impl; import com.bonus.digitalSignage.basic.dao.TbThreeSpanMapper; -import com.bonus.digitalSignage.basic.dao.TbTowerMapper; import com.bonus.digitalSignage.basic.service.TbThreeSpanService; -import com.bonus.digitalSignage.basic.vo.TbProjectVo; import com.bonus.digitalSignage.basic.vo.TbThreeSpanVo; -import com.bonus.digitalSignage.basic.vo.TbTowerVo; import com.bonus.digitalSignage.utils.ServerResponse; import com.bonus.digitalSignage.utils.UserUtil; -import com.bonus.digitalSignage.webResult.StringUtils; import com.github.pagehelper.PageInfo; 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 5860cea..039d41a 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 @@ -2,7 +2,6 @@ package com.bonus.digitalSignage.basic.service.impl; import com.bonus.digitalSignage.basic.dao.TbTowerMapper; import com.bonus.digitalSignage.basic.service.TbTowerService; -import com.bonus.digitalSignage.basic.vo.TbProjectVo; import com.bonus.digitalSignage.basic.vo.TbTowerVo; import com.bonus.digitalSignage.utils.CoordinateConverter; import com.bonus.digitalSignage.utils.ServerResponse; 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 36e2641..c28710f 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbCablewaTransVo.java @@ -1,5 +1,6 @@ package com.bonus.digitalSignage.basic.vo; +import com.bonus.digitalSignage.utils.Excel; import lombok.Data; import java.util.Date; @@ -26,16 +27,36 @@ public class TbCablewaTransVo { */ private Long towerId; + /** + *杆塔名称 + */ + @Excel(name = "索道所在塔杆", sort = 1) + private String towerName; + /** * 索道长度(km) */ + @Excel(name = "索道长度(km)", sort = 2) private String cablewayLength; /** * 最大载重(kg) */ + @Excel(name = "最大载重(kg)", sort = 3) private String maxHeight; + /** + * 安全距离(m) + */ + @Excel(name = "安全距离(m)", sort = 4) + private String safetyDistance; + + /** + * 最大坡度(°) + */ + @Excel(name = "最大坡度", sort = 5) + private String maxSlope; + /** * 是否可用 1,可用 0.不可用 */ @@ -47,7 +68,20 @@ public class TbCablewaTransVo { private Date createTime; /** - * 创建时间 + * 修改时间 */ private Date updateTime; + + /** + * 创建人id + */ + private Long createUserId; + + /** + * 修改人id + */ + private Long updateUserId; + + private int pageNum = 1; + private int pageSize = 10; } diff --git a/src/main/resources/mappers/basic/TbCablewaTransMapper.xml b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml new file mode 100644 index 0000000..38353d4 --- /dev/null +++ b/src/main/resources/mappers/basic/TbCablewaTransMapper.xml @@ -0,0 +1,63 @@ + + + + + insert into tb_cablewa_trans + + pro_id, + tower_id, + cableway_length, + max_height, + safety_distance, + max_slope, + create_time, + create_user_id, + is_actvice + + + #{proId}, + #{towerId}, + #{cablewayLength}, + #{maxHeight}, + #{safetyDistance}, + #{maxSlope}, + #{createTime}, + #{createUserId}, + 1 + + + + update tb_cablewa_trans + + tower_id = #{towerId}, + cableway_length = #{cablewayLength}, + max_height = #{maxHeight}, + safety_distance = #{safetyDistance}, + max_slope = #{maxSlope}, + update_user_id = #{updateUserId}, + update_time = now() + + where id = #{id} + + + update tb_cablewa_trans set is_active = '0' where id =#{id} + + + + +