From ff80944e88c3fa67ef9fa01293b860fa6d224a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Sun, 27 Apr 2025 11:26:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E8=B7=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbThreeSpanController.java | 94 ++++++++++++++ .../basic/dao/TbThreeSpanMapper.java | 14 +++ .../basic/service/TbThreeSpanService.java | 46 +++++++ .../service/impl/TbThreeSpanServiceImpl.java | 116 ++++++++++++++++++ .../basic/vo/TbThreeSpanVo.java | 99 +++++++++++++++ .../mappers/basic/TbThreeSpanMapper.xml | 75 +++++++++++ 6 files changed, 444 insertions(+) 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 173202f..16d20e0 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java +++ b/src/main/java/com/bonus/digitalSignage/basic/controller/TbThreeSpanController.java @@ -1,9 +1,24 @@ 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; +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/25 @@ -13,4 +28,83 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j public class TbThreeSpanController { + @Resource + private TbThreeSpanService tbThreeSpanService; + + /** + * 三跨管理-查询列表 + * @param dto + * @return + */ + @PostMapping(value = "getTbThreeSpanList") + @DecryptAndVerify(decryptedClass = TbThreeSpanVo.class)//加解密统一管理 + @LogAnnotation(operModul = "三跨管理-查询列表", operation = "查询列表", operDesc = "系统级事件",operType="查询") + public ServerResponse getTbThreeSpanList(EncryptedReq dto) { + PageHelper.startPage(dto.getData().getPageNum(), dto.getData().getPageSize()); + return tbThreeSpanService.getTbThreeSpanList(dto.getData()); + } + + /** + * 三跨管理-查询详情 + * @param dto + * @return + */ + @PostMapping(value = "getTbThreeSpanById") + @DecryptAndVerify(decryptedClass = TbThreeSpanVo.class)//加解密统一管理 + @LogAnnotation(operModul = "三跨管理-查询详情", operation = "查询详情", operDesc = "系统级事件",operType="查询") + public ServerResponse getTbThreeSpanById(EncryptedReq dto) { + return tbThreeSpanService.getTbThreeSpanById(dto.getData()); + } + + /** + * 三跨管理-新增 + * @param dto + * @return + */ + @PostMapping(value = "addTbThreeSpan") + @DecryptAndVerify(decryptedClass = TbThreeSpanVo.class)//加解密统一管理 + @LogAnnotation(operModul = "三跨管理-新增", operation = "新增", operDesc = "系统级事件",operType="查询") + public ServerResponse addTbThreeSpan(EncryptedReq dto) { + return tbThreeSpanService.addTbThreeSpan(dto.getData()); + } + + /** + * 三跨管理-修改 + * @param dto + * @return + */ + @PostMapping(value = "updateTbThreeSpan") + @DecryptAndVerify(decryptedClass = TbThreeSpanVo.class)//加解密统一管理 + @LogAnnotation(operModul = "三跨管理-修改", operation = "修改", operDesc = "系统级事件",operType="查询") + public ServerResponse updateTbThreeSpan(EncryptedReq dto) { + return tbThreeSpanService.updateTbThreeSpan(dto.getData()); + } + + /** + * 三跨管理-删除 + * @param dto + * @return + */ + @PostMapping(value = "delTbThreeSpan") + @DecryptAndVerify(decryptedClass = TbThreeSpanVo.class)//加解密统一管理 + @LogAnnotation(operModul = "三跨管理-删除", operation = "删除", operDesc = "系统级事件",operType="查询") + public ServerResponse delTbThreeSpan(EncryptedReq dto) { + return tbThreeSpanService.delTbThreeSpan(dto.getData()); + } + + /** + *三跨管理导出 + * @param data + * @return + */ + @PostMapping(value = "/tbProjectExport") + @DecryptAndVerify(decryptedClass = TbThreeSpanVo.class) + @LogAnnotation(operModul = "三跨管理-导出", operation = "导出", operDesc = "系统级事件",operType="导出") + public void tbProjectExport(HttpServletResponse response, EncryptedReq data) { + + List tbThreeSpanVoList = tbThreeSpanService.tbProjectAll(data.getData()); + ExcelUtil util = new ExcelUtil<>(TbThreeSpanVo.class); + util.exportExcel(response, tbThreeSpanVoList, "三跨管理"); + } + } 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 90f948c..8784eb6 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/dao/TbThreeSpanMapper.java +++ b/src/main/java/com/bonus/digitalSignage/basic/dao/TbThreeSpanMapper.java @@ -1,4 +1,18 @@ package com.bonus.digitalSignage.basic.dao; +import com.bonus.digitalSignage.basic.vo.TbThreeSpanVo; + +import java.util.List; + public interface TbThreeSpanMapper { + + List getTbThreeSpanList(TbThreeSpanVo data); + + TbThreeSpanVo getTbThreeSpanById(TbThreeSpanVo data); + + void addTbThreeSpan(TbThreeSpanVo data); + + void updateTbThreeSpan(TbThreeSpanVo data); + + void delTbThreeSpan(TbThreeSpanVo 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 3c58b9d..5212f64 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/service/TbThreeSpanService.java +++ b/src/main/java/com/bonus/digitalSignage/basic/service/TbThreeSpanService.java @@ -1,4 +1,50 @@ 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; + public interface TbThreeSpanService { + /** + * 三跨管理-查询列表 + * @param data + * @return + */ + ServerResponse getTbThreeSpanList(TbThreeSpanVo data); + + /** + * 三跨管理-查询详情 + * @param data + * @return + */ + ServerResponse getTbThreeSpanById(TbThreeSpanVo data); + + /** + * 三跨管理-新增 + * @param data + * @return + */ + ServerResponse addTbThreeSpan(TbThreeSpanVo data); + + /** + * 三跨管理-修改 + * @param data + * @return + */ + ServerResponse updateTbThreeSpan(TbThreeSpanVo data); + + /** + * 三跨管理-删除 + * @param data + * @return + */ + ServerResponse delTbThreeSpan(TbThreeSpanVo data); + /** + *三跨管理查询全部列表 + * @param data + * @return + */ + List tbProjectAll(TbThreeSpanVo data); } 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 5f6e3ad..aaadd44 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,10 +1,126 @@ 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; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.List; /** * @author 马三炮 * @date 2025/4/25 */ +@Service +@Slf4j public class TbThreeSpanServiceImpl implements TbThreeSpanService { + + @Resource + private TbThreeSpanMapper tbThreeSpanMapper; + + /** + * 三跨管理-查询列表 + * @param data + * @return + */ + @Override + public ServerResponse getTbThreeSpanList(TbThreeSpanVo data) { + try { + List tbThreeSpanVoList = tbThreeSpanMapper.getTbThreeSpanList(data); + PageInfo pageInfo = new PageInfo<>(tbThreeSpanVoList); + 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 getTbThreeSpanById(TbThreeSpanVo data) { + try { + TbThreeSpanVo tbThreeSpanVo = tbThreeSpanMapper.getTbThreeSpanById(data); + return ServerResponse.createSuccess(tbThreeSpanVo); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("三跨管理-查询详情失败"); + } + } + + /** + * 三跨管理-新增 + * @param data + * @return + */ + @Override + public ServerResponse addTbThreeSpan(TbThreeSpanVo data) { + try { + Long userId = UserUtil.getLoginUser().getId(); + data.setCreateUserId(userId); + data.setCreateTime(new Date()); + tbThreeSpanMapper.addTbThreeSpan(data); + return ServerResponse.createSuccess("三跨管理-新增成功"); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("三跨管理-新增失败"); + } + } + + /** + * 三跨管理-修改 + * @param data + * @return + */ + @Override + public ServerResponse updateTbThreeSpan(TbThreeSpanVo data) { + try { + Long userId = UserUtil.getLoginUser().getId(); + data.setUpdateUserId(userId); + tbThreeSpanMapper.updateTbThreeSpan(data); + return ServerResponse.createSuccess("三跨管理-修改成功"); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("三跨管理-修改失败"); + } + } + + /** + * 三跨管理-删除 + * @param data + * @return + */ + @Override + public ServerResponse delTbThreeSpan(TbThreeSpanVo data) { + try { + tbThreeSpanMapper.delTbThreeSpan(data); + return ServerResponse.createSuccess("三跨管理-删除成功"); + } catch (Exception e) { + log.error(e.toString(), e); + return ServerResponse.createErroe("三跨管理-删除失败"); + } + } + /** + *三跨管理查询全部列表 + * @param data + * @return + */ + @Override + public List tbProjectAll(TbThreeSpanVo data) { + List tbThreeSpanVoList = tbThreeSpanMapper.getTbThreeSpanList(data); + return tbThreeSpanVoList; + } } diff --git a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java index 528aef9..29cd8c0 100644 --- a/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java +++ b/src/main/java/com/bonus/digitalSignage/basic/vo/TbThreeSpanVo.java @@ -1,8 +1,107 @@ package com.bonus.digitalSignage.basic.vo; +import lombok.Data; + +import java.util.Date; + /** * @author 马三炮 * @date 2025/4/25 */ +@Data public class TbThreeSpanVo { + + /** + * id + */ + private Long id; + + /** + * 工程id + */ + private Long proId; + + /** + * 跨越类型 1.跨线路 2.跨公路 3.跨铁路 + */ + private String spanType; + + /** + * 开始杆塔id + */ + private Long towerId; + + /** + * 结束杆塔id + */ + private Long nextTowerId; + + /** + * 上层线路 + */ + private Long upperLine; + + /** + * 下层线路 + */ + private Long lowerLine; + + /** + * 交叉角度 + */ + private Long intersectionAngle; + + /** + * 垂直距离（m） + */ + private Long verticalDistance; + + /** + * 安全裕度（°） + */ + private Long safetyMargin; + + /** + * 垂直净距（m） + */ + private Long verticalClearDistance; + + /** + * 杆塔间距（m） + */ + private Long towerSpacing; + + /** + * 公路宽度（m） + */ + private Long highwayWidth; + + /** + * 是否可用1.可用 0.不可用 + */ + private Long isActive; + + /** + * 创建时间 + */ + 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/TbThreeSpanMapper.xml b/src/main/resources/mappers/basic/TbThreeSpanMapper.xml index 6e3bc03..685d0b9 100644 --- a/src/main/resources/mappers/basic/TbThreeSpanMapper.xml +++ b/src/main/resources/mappers/basic/TbThreeSpanMapper.xml @@ -2,5 +2,80 @@ + + insert into tb_three_span + + pro_id, + span_type, + tower_id, + next_tower_id, + upper_line, + lower_line, + intersection_angle, + vertical_distance, + safety_margin, + vertical_clear_distance, + tower_spacing, + highway_width, + create_time, + create_user_id, + is_actvice + + + #{proId}, + #{spanType}, + #{towerId}, + #{nextTowerId}, + #{upperLine}, + #{lowerLine}, + #{intersectionAngle}, + #{verticalDistance}, + #{safetyMargin}, + #{verticalClearDistance}, + #{towerSpacing}, + #{highwayWidth}, + #{createTime}, + #{createUserId}, + 1 + + + + update tb_three_span + + span_type = #{spanType}, + tower_id = #{towerId}, + next_tower_id = #{nextTowerId}, + upper_line = #{upperLine}, + lower_line = #{lowerLine}, + intersection_angle = #{intersectionAngle}, + vertical_distance = #{verticalDistance}, + safety_margin = #{safetyMargin}, + vertical_clear_distance = #{verticalClearDistance}, + tower_spacing = #{towerSpacing}, + highway_width = #{highwayWidth}, + update_user_id = #{updateUserId}, + update_time = now() + + where id = #{id} + + + update tb_three_span set is_active = 0 where id = #{id} + + + +