fuhao
/
board_publish
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(情报板定义尺寸字段修改):

This commit is contained in:
fuhao 2024-09-04 15:27:56 +08:00
parent dbeb12bc0a
commit 6c9c561b2c
No known key found for this signature in database
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ruoyi-system/src/main/java/com/ruoyi/board/domain/BoardInfo.java
View File

@ -48,8 +48,8 @@ public class BoardInfo extends BaseEntity {
/** /**
* 情报板尺寸 * 情报板尺寸
*/ */
@TableField(value = "board_size") @TableField(value = "board_size_type")
private String boardSize; private Integer boardSizeType;
/** /**
* 情报板品牌 * 情报板品牌
@ -68,10 +68,4 @@ public class BoardInfo extends BaseEntity {
*/ */
@TableField(value = "board_ip") @TableField(value = "board_ip")
private String boardIp; private String boardIp;
/**
* 情报板端口号
*/
@TableField(value = "board_port")
private Integer boardPort;
} }

10
ruoyi-system/src/main/java/com/ruoyi/board/domain/dto/BoardInfoAndRoadDTO.java
View File

@ -29,6 +29,16 @@ public class BoardInfoAndRoadDTO {
*/ */
private String boardMileage; private String boardMileage;
/**
* 情报板类型ID
*/
private Integer boardSizeType;
/**
* 情报板类型名称
*/
private String boardSizeName;
/** /**
* 情报板尺寸 * 情报板尺寸
*/ */

2
ruoyi-system/src/main/java/com/ruoyi/board/service/IBoardInfoService.java
View File

@ -10,7 +10,5 @@ public interface IBoardInfoService extends MPJBaseService<BoardInfo> {
BoardInfo getOneByIP(String ip); BoardInfo getOneByIP(String ip);
List<BoardInfo> listPage(BoardInfo boardInfo);
List<BoardInfoAndRoadDTO> listBoardInfoDTO(BoardInfo boardInfo); List<BoardInfoAndRoadDTO> listBoardInfoDTO(BoardInfo boardInfo);
} }

17
ruoyi-system/src/main/java/com/ruoyi/board/service/impl/BoardInfoServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.github.yulichang.base.MPJBaseServiceImpl; import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.github.yulichang.wrapper.MPJLambdaWrapper;
import com.ruoyi.board.domain.BoardInfo; import com.ruoyi.board.domain.BoardInfo;
import com.ruoyi.board.domain.BoardType;
import com.ruoyi.board.domain.RoadGroup; import com.ruoyi.board.domain.RoadGroup;
import com.ruoyi.board.domain.dto.BoardInfoAndRoadDTO; import com.ruoyi.board.domain.dto.BoardInfoAndRoadDTO;
import com.ruoyi.board.mapper.BoardInfoMapper; import com.ruoyi.board.mapper.BoardInfoMapper;
@ -23,27 +24,19 @@ public class BoardInfoServiceImpl extends MPJBaseServiceImpl<BoardInfoMapper, Bo
return getOne(boardInfoLambdaQueryWrapper); return getOne(boardInfoLambdaQueryWrapper);
} }
@Override
public List<BoardInfo> listPage(BoardInfo boardInfo) {
LambdaQueryWrapper<BoardInfo> 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 @Override
public List<BoardInfoAndRoadDTO> listBoardInfoDTO(BoardInfo boardInfo) { public List<BoardInfoAndRoadDTO> listBoardInfoDTO(BoardInfo boardInfo) {
MPJLambdaWrapper<BoardInfo> eq = new MPJLambdaWrapper<BoardInfo>() MPJLambdaWrapper<BoardInfo> eq = new MPJLambdaWrapper<BoardInfo>()
.selectAll(BoardInfo.class) .selectAll(BoardInfo.class)
.select(RoadGroup::getRoadName) .select(RoadGroup::getRoadName)
.selectAs(BoardType::getName, "board_size_name")
.selectAs(BoardType::getSize, "board_size")
.leftJoin(RoadGroup.class, RoadGroup::getId, BoardInfo::getBoardRoadSection) .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.getBoardName()), BoardInfo::getBoardName, boardInfo.getBoardName())
.likeRight(StringUtils.isNotEmpty(boardInfo.getBoardMileage()), BoardInfo::getBoardMileage, boardInfo.getBoardMileage()) .likeRight(StringUtils.isNotEmpty(boardInfo.getBoardMileage()), BoardInfo::getBoardMileage, boardInfo.getBoardMileage())
.eq(StringUtils.isNotEmpty(boardInfo.getBoardRoadSection()), BoardInfo::getBoardRoadSection, boardInfo.getBoardRoadSection()); .eq(StringUtils.isNotEmpty(boardInfo.getBoardRoadSection()), BoardInfo::getBoardRoadSection, boardInfo.getBoardRoadSection());
return selectJoinList(BoardInfoAndRoadDTO.class, eq); return selectJoinList(BoardInfoAndRoadDTO.class, eq);
} }
} }