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 ee02905c..8f777c8b 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 @@ -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 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 cb82b617..166b8e1b 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 @@ -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; - - } 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 d165495a..dc5b38ec 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.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