From 7152082c6dd3895bb3f30787d046dfaf9b96fe8c Mon Sep 17 00:00:00 2001 From: fuhao Date: Tue, 3 Sep 2024 18:26:02 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=83=85=E6=8A=A5=E6=9D=BF=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=BF=9E=E8=A1=A8=E6=9F=A5=E8=AF=A2DTO=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=9B=9E):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/board/BoardInfoController.java | 3 +- .../board/domain/dto/BoardInfoAndRoadDTO.java | 58 +++++++++++++++++++ .../board/service/IBoardInfoService.java | 3 + .../service/impl/BoardInfoServiceImpl.java | 21 ++++++- 4 files changed, 81 insertions(+), 4 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/BoardInfoAndRoadDTO.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/board/BoardInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/board/BoardInfoController.java index db4f6c67..6a0bc2f4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/board/BoardInfoController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/board/BoardInfoController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.controller.board; import com.alibaba.fastjson2.JSON; import com.ruoyi.board.domain.BoardInfo; +import com.ruoyi.board.domain.dto.BoardInfoAndRoadDTO; import com.ruoyi.board.service.IBoardInfoService; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; @@ -35,7 +36,7 @@ public class BoardInfoController extends BaseController { @GetMapping("/list") public TableDataInfo list(BoardInfo boardInfo) { startPage(); - List list = boardInfoService.listPage(boardInfo); + List list = boardInfoService.listBoardInfoDTO(boardInfo); return getDataTable(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/BoardInfoAndRoadDTO.java b/ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/BoardInfoAndRoadDTO.java new file mode 100644 index 00000000..00af53eb --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/BoardInfoAndRoadDTO.java @@ -0,0 +1,58 @@ +package com.ruoyi.board.domain.dto; + +import lombok.Data; + +@Data +public class BoardInfoAndRoadDTO { + /** + * 唯一标识 + */ + private Integer id; + + /** + * 情报板名称 + */ + private String boardName; + + /** + * 情报板路段 + */ + private String boardRoadSection; + + /** + * 情报板方向 + */ + private String boardDirection; + + /** + * 情报板工桩号 + */ + private String boardMileage; + + /** + * 情报板尺寸 + */ + private String boardSize; + + /** + * 情报板品牌 + */ + private String boardBrand; + + /** + * 情报板通讯协议 + */ + private String boardCommunicationProtocol; + + /** + * 情报板IP + */ + private String boardIp; + + /** + * 路段名称 + */ + private String roadName; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/service/IBoardInfoService.java b/ruoyi-system/src/main/java/com/ruoyi/board/service/IBoardInfoService.java index 2b0c9742..4a164945 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/board/service/IBoardInfoService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/board/service/IBoardInfoService.java @@ -2,6 +2,7 @@ package com.ruoyi.board.service; import com.github.yulichang.base.MPJBaseService; import com.ruoyi.board.domain.BoardInfo; +import com.ruoyi.board.domain.dto.BoardInfoAndRoadDTO; import java.util.List; @@ -10,4 +11,6 @@ public interface IBoardInfoService extends MPJBaseService { BoardInfo getOneByIP(String ip); List listPage(BoardInfo boardInfo); + + List listBoardInfoDTO(BoardInfo boardInfo); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/service/impl/BoardInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/board/service/impl/BoardInfoServiceImpl.java index 78c0289b..50be5780 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/board/service/impl/BoardInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/board/service/impl/BoardInfoServiceImpl.java @@ -2,11 +2,14 @@ package com.ruoyi.board.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.github.yulichang.base.MPJBaseServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.ruoyi.board.domain.BoardInfo; +import com.ruoyi.board.domain.RoadGroup; +import com.ruoyi.board.domain.dto.BoardInfoAndRoadDTO; +import com.ruoyi.board.mapper.BoardInfoMapper; +import com.ruoyi.board.service.IBoardInfoService; import com.ruoyi.common.utils.StringUtils; import org.springframework.stereotype.Service; -import com.ruoyi.board.mapper.BoardInfoMapper; -import com.ruoyi.board.domain.BoardInfo; -import com.ruoyi.board.service.IBoardInfoService; import java.util.List; @@ -31,4 +34,16 @@ public class BoardInfoServiceImpl extends MPJBaseServiceImpl listBoardInfoDTO(BoardInfo boardInfo) { + MPJLambdaWrapper eq = new MPJLambdaWrapper() + .selectAll(BoardInfo.class) + .select(RoadGroup::getRoadName) + .leftJoin(RoadGroup.class, RoadGroup::getId, BoardInfo::getBoardRoadSection) + .likeRight(StringUtils.isNotEmpty(boardInfo.getBoardName()), BoardInfo::getBoardName, boardInfo.getBoardName()) + .likeRight(StringUtils.isNotEmpty(boardInfo.getBoardMileage()), BoardInfo::getBoardMileage, boardInfo.getBoardMileage()) + .eq(StringUtils.isNotEmpty(boardInfo.getBoardRoadSection()), BoardInfo::getBoardRoadSection, boardInfo.getBoardRoadSection()); + return selectJoinList(BoardInfoAndRoadDTO.class, eq); + } }