diff --git a/jsowell-admin/src/main/resources/application.yml b/jsowell-admin/src/main/resources/application.yml index 3d14d9ca1..30a3f3f6b 100644 --- a/jsowell-admin/src/main/resources/application.yml +++ b/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 字符验证 diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/file/MimeTypeUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/file/MimeTypeUtils.java index cea243d2a..2d6cf7be8 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/util/file/MimeTypeUtils.java +++ b/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) { 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 53c78d8c7..e42af3b49 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 @@ -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) { - this.desc = desc; + public String getDescription() { + return description; } - public String getDesc() { - return desc; + public void setDescription(String description) { + 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()) diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java index 42285bdb4..8dac1741e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileFirmwareInfoServiceImpl.java +++ b/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); } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml index e05b52656..2f3b295f1 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml @@ -4,10 +4,10 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - + @@ -17,10 +17,10 @@ - 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 - and name like concat('%', #{name}, '%') @@ -32,12 +32,12 @@ where id = #{id} - + insert into pile_firmware_info id, name, - desc, + description, file_path, create_time, create_by, @@ -48,7 +48,7 @@ #{id}, #{name}, - #{desc}, + #{description}, #{filePath}, #{createTime}, #{createBy}, @@ -58,11 +58,11 @@ - + update pile_firmware_info name = #{name}, - desc = #{desc}, + description = #{description}, file_path = #{filePath}, create_time = #{createTime}, create_by = #{createBy}, diff --git a/jsowell-ui/src/views/pile/firmware/index.vue b/jsowell-ui/src/views/pile/firmware/index.vue index e294c8690..a06b4d05b 100644 --- a/jsowell-ui/src/views/pile/firmware/index.vue +++ b/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); } }