From edb2faafa5a332e8d8f686a0765d0306c4ac1f4d Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Fri, 30 Jun 2023 15:58:40 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=85=85=E7=94=B5=E6=A1=A9=E5=9B=BA?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF=E8=A1=A8=E6=96=B0=E5=A2=9E=E9=80=82?=
 =?UTF-8?q?=E7=94=A8=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/pile/domain/PileFirmwareInfo.java | 50 ++++---------------
 .../mapper/pile/PileFirmwareInfoMapper.xml    |  6 ++-
 2 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileFirmwareInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileFirmwareInfo.java
index e42af3b49..c59f1ed57 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileFirmwareInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/PileFirmwareInfo.java
@@ -2,6 +2,8 @@ package com.jsowell.pile.domain;
 
 import com.jsowell.common.annotation.Excel;
 import com.jsowell.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -11,6 +13,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author jsowell
  * @date 2023-06-28
  */
+@Getter
+@Setter
 public class PileFirmwareInfo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -37,51 +41,17 @@ public class PileFirmwareInfo extends BaseEntity {
     @Excel(name = "路径")
     private String filePath;
 
+    /**
+     * 适用类型（1-直流；2-交流）
+     */
+    @Excel(name = "适用类型")
+    private String applyType;
+
     /**
      * 删除标识（0-正常；1-删除）
      */
     private String delFlag;
 
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public void setFilePath(String filePath) {
-        this.filePath = filePath;
-    }
-
-    public String getFilePath() {
-        return filePath;
-    }
-
-    public void setDelFlag(String delFlag) {
-        this.delFlag = delFlag;
-    }
-
-    public String getDelFlag() {
-        return delFlag;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml
index 2f3b295f1..dbc6ccdea 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml
@@ -9,6 +9,7 @@
         <result property="name"    column="name"    />
         <result property="description"    column="description"    />
         <result property="filePath"    column="file_path"    />
+        <result property="applyType"    column="apply_type"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
@@ -17,7 +18,7 @@
     </resultMap>
 
     <sql id="selectPileFirmwareInfoVo">
-        select id, name, description, file_path, create_time, create_by, update_time, update_by, del_flag from pile_firmware_info
+        select id, name, description, file_path, apply_type, create_time, create_by, update_time, update_by, del_flag from pile_firmware_info
     </sql>
 
     <select id="selectPileFirmwareInfoList" parameterType="com.jsowell.pile.domain.PileFirmwareInfo" resultMap="PileFirmwareInfoResult">
@@ -39,6 +40,7 @@
             <if test="name != null">name,</if>
             <if test="description != null">description,</if>
             <if test="filePath != null">file_path,</if>
+            <if test="applyType != null">apply_type,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
@@ -50,6 +52,7 @@
             <if test="name != null">#{name},</if>
             <if test="description != null">#{description},</if>
             <if test="filePath != null">#{filePath},</if>
+            <if test="applyType != null">#{applyType},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
@@ -64,6 +67,7 @@
             <if test="name != null">name = #{name},</if>
             <if test="description != null">description = #{description},</if>
             <if test="filePath != null">file_path = #{filePath},</if>
+            <if test="applyType != null">apply_type = #{applyType},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>