From 6c9c561b2c19e3ded3ab9f828f4868899f68230a Mon Sep 17 00:00:00 2001 From: fuhao Date: Wed, 4 Sep 2024 15:27:56 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=83=85=E6=8A=A5=E6=9D=BF=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B0=BA=E5=AF=B8=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= =?UTF-8?q?):?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/board/domain/BoardInfo.java | 10 ++-------- .../board/domain/dto/BoardInfoAndRoadDTO.java | 10 ++++++++++ .../ruoyi/board/service/IBoardInfoService.java | 2 -- .../service/impl/BoardInfoServiceImpl.java | 17 +++++------------ 4 files changed, 17 insertions(+), 22 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/board/domain/BoardInfo.java b/ruoyi-system/src/main/java/com/ruoyi/board/domain/BoardInfo.java index 7867dcdd..ee02905c 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/board/domain/BoardInfo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/board/domain/BoardInfo.java @@ -48,8 +48,8 @@ public class BoardInfo extends BaseEntity { /** * 情报板尺寸 */ - @TableField(value = "board_size") - private String boardSize; + @TableField(value = "board_size_type") + private Integer boardSizeType; /** * 情报板品牌 @@ -68,10 +68,4 @@ public class BoardInfo extends BaseEntity { */ @TableField(value = "board_ip") private String boardIp; - - /** - * 情报板端口号 - */ - @TableField(value = "board_port") - private Integer boardPort; } \ No newline at end of file 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 index 00af53eb..cb82b617 100644 --- 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 @@ -29,6 +29,16 @@ public class BoardInfoAndRoadDTO { */ private String boardMileage; + /** + * 情报板类型ID + */ + private Integer boardSizeType; + + /** + * 情报板类型名称 + */ + private String boardSizeName; + /** * 情报板尺寸 */ 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 4a164945..6165794c 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 @@ -10,7 +10,5 @@ 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 50be5780..d165495a 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 @@ -4,6 +4,7 @@ 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.BoardType; import com.ruoyi.board.domain.RoadGroup; import com.ruoyi.board.domain.dto.BoardInfoAndRoadDTO; import com.ruoyi.board.mapper.BoardInfoMapper; @@ -23,27 +24,19 @@ public class BoardInfoServiceImpl extends MPJBaseServiceImpl listPage(BoardInfo boardInfo) { - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.likeRight(StringUtils.isNotEmpty(boardInfo.getBoardName()), BoardInfo::getBoardName, boardInfo.getBoardName()); - wrapper.likeRight(StringUtils.isNotEmpty(boardInfo.getBoardMileage()), BoardInfo::getBoardMileage, boardInfo.getBoardMileage()); - wrapper.eq(StringUtils.isNotEmpty(boardInfo.getBoardSize()), BoardInfo::getBoardSize, boardInfo.getBoardSize()); - wrapper.eq(StringUtils.isNotEmpty(boardInfo.getBoardBrand()), BoardInfo::getBoardBrand, boardInfo.getBoardBrand()); - wrapper.eq(StringUtils.isNotEmpty(boardInfo.getBoardCommunicationProtocol()), BoardInfo::getBoardCommunicationProtocol, boardInfo.getBoardCommunicationProtocol()); - wrapper.eq(StringUtils.isNotEmpty(boardInfo.getBoardRoadSection()), BoardInfo::getBoardRoadSection, boardInfo.getBoardRoadSection()); - return list(wrapper); - } - @Override public List listBoardInfoDTO(BoardInfo boardInfo) { MPJLambdaWrapper eq = new MPJLambdaWrapper() .selectAll(BoardInfo.class) .select(RoadGroup::getRoadName) + .selectAs(BoardType::getName, "board_size_name") + .selectAs(BoardType::getSize, "board_size") .leftJoin(RoadGroup.class, RoadGroup::getId, BoardInfo::getBoardRoadSection) + .leftJoin(BoardType.class, BoardType::getId, BoardInfo::getBoardSizeType) .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); } }