update 修改字段名

jsowell-admin/src/main/resources/application.yml

@@ -8,8 +8,6 @@ jsowell:
   copyrightYear: 2022
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/jsowell/uploadPath，Linux配置 /home/jsowell/uploadPath）
-  profile: D:/jsowell/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

jsowell-common/src/main/java/com/jsowell/common/util/file/MimeTypeUtils.java

@@ -25,6 +25,8 @@ public class MimeTypeUtils {
 
 	public static final String[] VIDEO_EXTENSION = {"mp4", "avi", "rmvb"};
 
+	public static final String[] FIRMWARE_EXTENSION = {"bin"};
+
 	public static final String[] DEFAULT_ALLOWED_EXTENSION = {
 			// 图片
 			"bmp", "gif", "jpg", "jpeg", "png",
@@ -35,7 +37,10 @@ public class MimeTypeUtils {
 			// 视频格式
 			"mp4", "avi", "rmvb",
 			// pdf
-			"pdf"};
+			"pdf",
+			// 固件格式
+			"bin"
+	};
 
 	public static String getExtension(String prefix) {
 		switch (prefix) {

jsowell-pile/src/main/java/com/jsowell/pile/domain/PileFirmwareInfo.java

@@ -29,7 +29,7 @@ public class PileFirmwareInfo extends BaseEntity {
      * 固件描述
      */
     @Excel(name = "固件描述")
-    private String desc;
+    private String description;
 
     /**
      * 路径
@@ -58,12 +58,12 @@ public class PileFirmwareInfo extends BaseEntity {
         return name;
     }
 
-    public void setDesc(String desc) {
+    public String getDescription() {
-        this.desc = desc;
+        return description;
     }
 
-    public String getDesc() {
+    public void setDescription(String description) {
-        return desc;
+        this.description = description;
     }
 
     public void setFilePath(String filePath) {
@@ -87,7 +87,7 @@ public class PileFirmwareInfo extends BaseEntity {
         return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
                 .append("id", getId())
                 .append("name", getName())
-                .append("desc", getDesc())
+                .append("desc", getDescription())
                 .append("filePath", getFilePath())
                 .append("createTime", getCreateTime())
                 .append("createBy", getCreateBy())

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java

@@ -46,11 +46,11 @@ public class PileFirmwareInfoServiceImpl implements IPileFirmwareInfoService {
      * 新增充电桩固件信息
      *
      * @param pileFirmwareInfo 充电桩固件信息
-     * @return 结果
+     * @return 结果 description
      */
     @Override
     public int insertPileFirmwareInfo(PileFirmwareInfo pileFirmwareInfo) {
-        pileFirmwareInfo.setCreateTime(DateUtils.getNowDate());
+        // pileFirmwareInfo.setCreateTime(DateUtils.getNowDate());
         return pileFirmwareInfoMapper.insertPileFirmwareInfo(pileFirmwareInfo);
     }
 

jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml

@@ -4,10 +4,10 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jsowell.pile.mapper.PileFirmwareInfoMapper">
 
-    <resultMap type="PileFirmwareInfo" id="PileFirmwareInfoResult">
+    <resultMap type="com.jsowell.pile.domain.PileFirmwareInfo" id="PileFirmwareInfoResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
-        <result property="desc"    column="desc"    />
+        <result property="description"    column="description"    />
         <result property="filePath"    column="file_path"    />
         <result property="createTime"    column="create_time"    />
         <result property="createBy"    column="create_by"    />
@@ -17,10 +17,10 @@
     </resultMap>
 
     <sql id="selectPileFirmwareInfoVo">
-        select id, name, desc, file_path, create_time, create_by, update_time, update_by, del_flag from pile_firmware_info
+        select id, name, description, file_path, create_time, create_by, update_time, update_by, del_flag from pile_firmware_info
     </sql>
 
-    <select id="selectPileFirmwareInfoList" parameterType="PileFirmwareInfo" resultMap="PileFirmwareInfoResult">
+    <select id="selectPileFirmwareInfoList" parameterType="com.jsowell.pile.domain.PileFirmwareInfo" resultMap="PileFirmwareInfoResult">
         <include refid="selectPileFirmwareInfoVo"/>
         <where>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -32,12 +32,12 @@
         where id = #{id}
     </select>
 
-    <insert id="insertPileFirmwareInfo" parameterType="PileFirmwareInfo">
+    <insert id="insertPileFirmwareInfo" parameterType="com.jsowell.pile.domain.PileFirmwareInfo">
         insert into pile_firmware_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="name != null">name,</if>
-            <if test="desc != null">desc,</if>
+            <if test="description != null">description,</if>
             <if test="filePath != null">file_path,</if>
             <if test="createTime != null">create_time,</if>
             <if test="createBy != null">create_by,</if>
@@ -48,7 +48,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="name != null">#{name},</if>
-            <if test="desc != null">#{desc},</if>
+            <if test="description != null">#{description},</if>
             <if test="filePath != null">#{filePath},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -58,11 +58,11 @@
         </trim>
     </insert>
 
-    <update id="updatePileFirmwareInfo" parameterType="PileFirmwareInfo">
+    <update id="updatePileFirmwareInfo" parameterType="com.jsowell.pile.domain.PileFirmwareInfo">
         update pile_firmware_info
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
-            <if test="desc != null">desc = #{desc},</if>
+            <if test="description != null">description = #{description},</if>
             <if test="filePath != null">file_path = #{filePath},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="createBy != null">create_by = #{createBy},</if>

jsowell-ui/src/views/pile/firmware/index.vue

@@ -291,7 +291,7 @@ export default {
         // 文件上传成功处理
         handleFileSuccess(response, file, fileList) {
             this.upload.isUploading = false;
-            this.form.filePath = response.url;
+            this.form.filePath = response.fileName;
             this.msgSuccess(response.msg);
         }
     }