From dfb244866147b75f7acf7a6e002beb24081ac6f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Wed, 15 May 2024 15:44:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=AD=E9=9F=B3=E5=B9=BF=E6=92=AD=20?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zc/business/domain/DcVoiceBroadcast.java  | 48 ++++---------------
 .../business/DcVoiceBroadcastMapper.xml       | 14 +++++-
 2 files changed, 22 insertions(+), 40 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcVoiceBroadcast.java b/zc-business/src/main/java/com/zc/business/domain/DcVoiceBroadcast.java
index 51cfc018..33e6ab75 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcVoiceBroadcast.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcVoiceBroadcast.java
@@ -2,6 +2,9 @@ package com.zc.business.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
@@ -13,7 +16,10 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * @author ruoyi
  * @date 2024-04-19
  */
+@Data
 @ApiModel("语音广播预发布对象")
+@NoArgsConstructor
+@AllArgsConstructor
 public class DcVoiceBroadcast extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -29,44 +35,8 @@ public class DcVoiceBroadcast extends BaseEntity
     /** 内容 */
     @Excel(name = "内容")
     private String content;
+private String repeatTimes;
+private String priority;
+private String outVol;
 
-    public void setId(Long id) 
-    {
-        this.id = id;
-    }
-
-    public Long getId() 
-    {
-        return id;
-    }
-    public void setCategory(String category) 
-    {
-        this.category = category;
-    }
-
-    public String getCategory() 
-    {
-        return category;
-    }
-    public void setContent(String content) 
-    {
-        this.content = content;
-    }
-
-    public String getContent() 
-    {
-        return content;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("category", getCategory())
-            .append("content", getContent())
-            .append("remark", getRemark())
-            .append("createTime", getCreateTime())
-            .append("updateTime", getUpdateTime())
-            .toString();
-    }
 }
diff --git a/zc-business/src/main/resources/mapper/business/DcVoiceBroadcastMapper.xml b/zc-business/src/main/resources/mapper/business/DcVoiceBroadcastMapper.xml
index 45b14aa3..2551fa05 100644
--- a/zc-business/src/main/resources/mapper/business/DcVoiceBroadcastMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcVoiceBroadcastMapper.xml
@@ -11,10 +11,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark"    column="remark"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="repeatTimes"    column="repeat_times"    />
+        <result property="outVol"    column="outVol"    />
+        <result property="priority"    column="priority"    />
     </resultMap>
 
     <sql id="selectDcVoiceBroadcastVo">
-        select id, category, content, remark, create_time, update_time from dc_voice_broadcast
+        select id, category, content, remark, create_time, update_time,priority,outVol,repeat_times from dc_voice_broadcast
     </sql>
 
     <select id="selectDcVoiceBroadcastList" parameterType="com.zc.business.domain.DcVoiceBroadcast" resultMap="DcVoiceBroadcastResult">
@@ -43,6 +46,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="priority != null">priority,</if>
+            <if test="outVol != null">outVol,</if>
+            <if test="repeatTimes != null">repeat_times,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="category != null">#{category},</if>
@@ -50,6 +56,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">#{remark},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="priority != null">#{priority},</if>
+            <if test="outVol != null">#{outVol},</if>
+            <if test="repeatTimes != null">#{repeatTimes},</if>
          </trim>
     </insert>
 
@@ -61,6 +70,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remark != null">remark = #{remark},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="repeatTimes != null">repeat_times = #{repeatTimes},</if>
+            <if test="outVol != null">outVol = #{outVol},</if>
+            <if test="priority != null">priority = #{priority},</if>
         </trim>
         where id = #{id}
     </update>