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

feat(情报板信息添加关联协议id):

This commit is contained in:
fuhao 2024-09-04 18:48:03 +08:00
parent 9648c11d6b
commit 10c575c4d7
No known key found for this signature in database
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,16 +52,10 @@ public class BoardInfo extends BaseEntity {
private Integer boardSizeType;
/**
* 情报板品牌
* 情报板品牌协议
*/
@TableField(value = "board_brand")
private String boardBrand;
/**
* 情报板通讯协议
*/
@TableField(value = "board_communication_protocol")
private String boardCommunicationProtocol;
@TableField(value = "board_brand_protocol")
private Integer boardBrandProtocol;
/**
* 情报板IP

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

@ -45,14 +45,19 @@ public class BoardInfoAndRoadDTO {
private String boardSize;
/**
* 情报板品牌
* 情报板品牌协议ID
*/
private String boardBrand;
private Integer boardBrandProtocol;
/**
* 情报板通讯协议
* 情报板品牌名
*/
private String boardCommunicationProtocol;
private String boardBrandName;
/**
* 情报板协议名
*/
private String boardProtocolName;
/**
* 情报板IP
@ -63,6 +68,4 @@ public class BoardInfoAndRoadDTO {
* 路段名称
*/
private String roadName;
}

5
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.wrapper.MPJLambdaWrapper;
import com.ruoyi.board.domain.BoardInfo;
import com.ruoyi.board.domain.BoardProtocol;
import com.ruoyi.board.domain.BoardType;
import com.ruoyi.board.domain.RoadGroup;
import com.ruoyi.board.domain.dto.BoardInfoAndRoadDTO;
@ -31,12 +32,14 @@ public class BoardInfoServiceImpl extends MPJBaseServiceImpl<BoardInfoMapper, Bo
.select(RoadGroup::getRoadName)
.selectAs(BoardType::getName, "board_size_name")
.selectAs(BoardType::getSize, "board_size")
.selectAs(BoardProtocol::getBrand, "board_brand_name")
.selectAs(BoardProtocol::getProtocol, "board_protocol_name")
.leftJoin(RoadGroup.class, RoadGroup::getId, BoardInfo::getBoardRoadSection)
.leftJoin(BoardType.class, BoardType::getId, BoardInfo::getBoardSizeType)
.leftJoin(BoardProtocol.class, BoardProtocol::getId, BoardInfo::getBoardBrandProtocol)
.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);
}
}