From 4508c3fb5e4a3ee7b36af56f7955f42aeb6051a2 Mon Sep 17 00:00:00 2001
From: lau572 <1010031226@qq.com>
Date: Tue, 23 Jan 2024 17:00:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=83=85=E6=8A=A5=E5=8F=91=E5=B8=83=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zc/business/domain/DcBoardReleaseLog.java | 29 ++++++++++++++++-
 .../business/DcBoardReleaseLogMapper.xml      | 31 +++++++++++--------
 2 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
index fb2a01b3..1599ad83 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcBoardReleaseLog.java
@@ -34,6 +34,16 @@ public class DcBoardReleaseLog extends BaseEntity
     @ApiModelProperty(value="设备名称")
     private String deviceName;
 
+    /** 桩号 */
+    @Excel(name = "桩号")
+    @ApiModelProperty(value="桩号")
+    private String stakeMarkId;
+
+    /** 方向1-上行,2-中,3-下行 */
+    @Excel(name = "方向1-上行,2-中,3-下行")
+    @ApiModelProperty(value="方向1-上行,2-中,3-下行")
+    private String direction;
+
     /** 发布内容 */
     @Excel(name = "发布内容")
     @ApiModelProperty(value="发布内容")
@@ -107,7 +117,24 @@ public class DcBoardReleaseLog extends BaseEntity
     {
         return deviceName;
     }
-    public void setReleaseContent(String releaseContent) 
+
+    public String getStakeMarkId() {
+        return stakeMarkId;
+    }
+
+    public void setStakeMarkId(String stakeMarkId) {
+        this.stakeMarkId = stakeMarkId;
+    }
+
+    public String getDirection() {
+        return direction;
+    }
+
+    public void setDirection(String direction) {
+        this.direction = direction;
+    }
+
+    public void setReleaseContent(String releaseContent)
     {
         this.releaseContent = releaseContent;
     }
diff --git a/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml b/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
index 1bdd604e..c3635195 100644
--- a/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcBoardReleaseLogMapper.xml
@@ -17,32 +17,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="releaseUserId"    column="release_user_id"    />
         <result property="platform"    column="platform"    />
         <result property="releaseIp"    column="release_ip"    />
+        <result property="stakeMarkId"    column="stake_mark_id"    />
+        <result property="direction"    column="direction"    />
     </resultMap>
 
     <sql id="selectDcBoardReleaseLogVo">
-        select id, device_id, device_name, release_content, release_status, release_time, release_dept_name, release_dept_id, release_user_name, release_user_id, platform,release_ip from dc_board_release_log
+        select t1.id, t1.device_id, t2.device_name,t2.stake_mark_id, t2.direction,t1.release_content, t1.release_status,
+            t1.release_time,t1.release_dept_name,t1.release_dept_id,t1.release_user_name,t1.release_user_id,t1.platform,release_ip
+        from dc_board_release_log t1
+        left join dc_device t2 on t1.device_id = t2.iot_device_id
     </sql>
 
     <select id="selectDcBoardReleaseLogList" parameterType="DcBoardReleaseLog" resultMap="DcBoardReleaseLogResult">
         <include refid="selectDcBoardReleaseLogVo"/>
         <where>  
-            <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
-            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
-            <if test="releaseContent != null  and releaseContent != ''"> and release_content = #{releaseContent}</if>
-            <if test="releaseStatus != null  and releaseStatus != ''"> and release_status = #{releaseStatus}</if>
-            <if test="releaseTime != null "> and release_time = #{releaseTime}</if>
-            <if test="releaseDeptName != null  and releaseDeptName != ''"> and release_dept_name like concat('%', #{releaseDeptName}, '%')</if>
-            <if test="releaseDeptId != null  and releaseDeptId != ''"> and release_dept_id = #{releaseDeptId}</if>
-            <if test="releaseUserName != null  and releaseUserName != ''"> and release_user_name like concat('%', #{releaseUserName}, '%')</if>
-            <if test="releaseUserId != null  and releaseUserId != ''"> and release_user_id = #{releaseUserId}</if>
-            <if test="releaseIp != null  and releaseIp != ''"> and release_ip = #{releaseIp}</if>
-            <if test="platform != null  and platform != ''"> and platform = #{platform}</if>
+            <if test="deviceId != null  and deviceId != ''"> and t1.device_id = #{deviceId}</if>
+            <if test="deviceName != null  and deviceName != ''"> and t2.device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="releaseContent != null  and releaseContent != ''"> and t1.release_content = #{releaseContent}</if>
+            <if test="releaseStatus != null  and releaseStatus != ''"> and t1.release_status = #{releaseStatus}</if>
+            <if test="releaseTime != null "> and t1.release_time = #{releaseTime}</if>
+            <if test="releaseDeptName != null  and releaseDeptName != ''"> and t1.release_dept_name like concat('%', #{releaseDeptName}, '%')</if>
+            <if test="releaseDeptId != null  and releaseDeptId != ''"> and t1.release_dept_id = #{releaseDeptId}</if>
+            <if test="releaseUserName != null  and releaseUserName != ''"> and t1.release_user_name like concat('%', #{releaseUserName}, '%')</if>
+            <if test="releaseUserId != null  and releaseUserId != ''"> and t1.release_user_id = #{releaseUserId}</if>
+            <if test="releaseIp != null  and releaseIp != ''"> and t1.release_ip = #{releaseIp}</if>
+            <if test="platform != null  and platform != ''"> and t1.platform = #{platform}</if>
         </where>
     </select>
     
     <select id="selectDcBoardReleaseLogById" parameterType="Long" resultMap="DcBoardReleaseLogResult">
         <include refid="selectDcBoardReleaseLogVo"/>
-        where id = #{id}
+        where t1.id = #{id}
     </select>
         
     <insert id="insertDcBoardReleaseLog" parameterType="DcBoardReleaseLog" useGeneratedKeys="true" keyProperty="id">