From 10c575c4d74be06172c39c0974e5b9229be9ec6d Mon Sep 17 00:00:00 2001
From: fuhao <fuhao@ciqihuo.net>
Date: Wed, 4 Sep 2024 18:48:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=83=85=E6=8A=A5=E6=9D=BF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=B7=BB=E5=8A=A0=E5=85=B3=E8=81=94=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?id):?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/board/domain/BoardInfo.java    | 12 +++---------
 .../board/domain/dto/BoardInfoAndRoadDTO.java     | 15 +++++++++------
 .../board/service/impl/BoardInfoServiceImpl.java  |  5 ++++-
 3 files changed, 16 insertions(+), 16 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 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<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);
     }
 }