diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java index ffa4b6138..7f4ded039 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/PileFirmwareInfoController.java @@ -5,12 +5,15 @@ import com.jsowell.common.core.controller.BaseController; import com.jsowell.common.core.domain.AjaxResult; import com.jsowell.common.core.page.TableDataInfo; import com.jsowell.common.enums.BusinessType; +import com.jsowell.common.response.RestApiResponse; +import com.jsowell.common.util.file.AliyunOssUploadUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.PileFirmwareInfo; import com.jsowell.pile.service.PileFirmwareInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -88,4 +91,19 @@ public class PileFirmwareInfoController extends BaseController { public AjaxResult remove(@PathVariable Long[] ids) { return toAjax(pileFirmwareInfoService.deletePileFirmwareInfoByIds(ids)); } + + + /** + * 上传蓝牙升级程序 + * @param file + * @return + */ + @PostMapping("/uploadBlueToothFile") + public AjaxResult uploadBlueToothFile(@RequestParam("avatarfile") MultipartFile file) { + if (!file.isEmpty()) { + String result = AliyunOssUploadUtils.uploadBlueToothFile(file); + return AjaxResult.success(); + } + return AjaxResult.error("上传文件错误!!"); + } } diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 92f0dd6a0..5b0f17d88 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -141,6 +141,8 @@ aliyunoss: bucketName: ydc-oss-dev # bucket下文件夹的路径 filehost: img + # 蓝牙小程序文件保存路径 + bluetoothFileHost: bluetooth # 访问域名 # url: https://ydc-oss-dev.oss-cn-shanghai.aliyuncs.com url: http://img.sit.jsowellcloud.com diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index d4a8040b7..0c70b27d4 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/jsowell-admin/src/main/resources/application-prd.yml @@ -140,6 +140,8 @@ aliyunoss: bucketName: ydc-oss-prod # bucket下文件夹的路径 filehost: img + # 蓝牙小程序文件保存路径 + bluetoothFileHost: bluetooth # 访问域名 # url: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com url: https://img.jsowellcloud.com diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index afe982603..421da02a5 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -140,6 +140,8 @@ aliyunoss: bucketName: ydc-oss-prod # bucket下文件夹的路径 filehost: img + # 蓝牙小程序文件保存路径 + bluetoothFileHost: bluetooth # 访问域名 # url: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com url: https://img.jsowellcloud.com diff --git a/jsowell-admin/src/main/resources/application-sit.yml b/jsowell-admin/src/main/resources/application-sit.yml index fdffe21b0..cc747b44d 100644 --- a/jsowell-admin/src/main/resources/application-sit.yml +++ b/jsowell-admin/src/main/resources/application-sit.yml @@ -140,6 +140,8 @@ aliyunoss: bucketName: ydc-oss-dev # bucket下文件夹的路径 filehost: img + # 蓝牙小程序文件保存路径 + bluetoothFileHost: bluetooth # 访问域名 # url: https://ydc-oss-dev.oss-cn-shanghai.aliyuncs.com url: http://img.sit.jsowellcloud.com diff --git a/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java b/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java index 09b5a9d83..48c7c762d 100644 --- a/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java +++ b/jsowell-common/src/main/java/com/jsowell/common/config/AliyunOssConfig.java @@ -1,5 +1,6 @@ package com.jsowell.common.config; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; @@ -31,6 +32,11 @@ public class AliyunOssConfig { */ private String filehost; + /** + * 蓝牙小程序文件路径 + */ + private String bluetoothFileHost; + /** * 访问域名 */ @@ -76,6 +82,14 @@ public class AliyunOssConfig { this.filehost = filehost; } + public String getBluetoothFileHost() { + return bluetoothFileHost; + } + + public void setBluetoothFileHost(String bluetoothFileHost) { + this.bluetoothFileHost = bluetoothFileHost; + } + public String getUrl() { return url; } @@ -86,13 +100,14 @@ public class AliyunOssConfig { @Override public String toString() { - return "AliyunOssConfig{" + - "endpoint='" + endpoint + '\'' + - ", accessKeyId='" + accessKeyId + '\'' + - ", accessKeySecret='" + accessKeySecret + '\'' + - ", bucketName='" + bucketName + '\'' + - ", filehost='" + filehost + '\'' + - ", url='" + url + '\'' + - '}'; + return new ToStringBuilder(this) + .append("endpoint", endpoint) + .append("accessKeyId", accessKeyId) + .append("accessKeySecret", accessKeySecret) + .append("bucketName", bucketName) + .append("filehost", filehost) + .append("bluetoothFileHost", bluetoothFileHost) + .append("url", url) + .toString(); } } \ No newline at end of file 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 c59f1ed57..a10369ed0 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 @@ -47,6 +47,18 @@ public class PileFirmwareInfo extends BaseEntity { @Excel(name = "适用类型") private String applyType; + /** + * 使用范围 + */ + @Excel(name = "使用范围") + private String useRange; + + /** + * 下载链接url + */ + @Excel(name = "下载链接url") + private String downloadUrl; + /** * 删除标识(0-正常;1-删除) */ @@ -54,16 +66,15 @@ public class PileFirmwareInfo extends BaseEntity { @Override public String toString() { - return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) - .append("id", getId()) - .append("name", getName()) - .append("desc", getDescription()) - .append("filePath", getFilePath()) - .append("createTime", getCreateTime()) - .append("createBy", getCreateBy()) - .append("updateTime", getUpdateTime()) - .append("updateBy", getUpdateBy()) - .append("delFlag", getDelFlag()) + return new ToStringBuilder(this) + .append("id", id) + .append("name", name) + .append("description", description) + .append("filePath", filePath) + .append("applyType", applyType) + .append("useRange", useRange) + .append("downloadUrl", downloadUrl) + .append("delFlag", delFlag) .toString(); } } diff --git a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml index dbc6ccdea..be56640c9 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/PileFirmwareInfoMapper.xml @@ -10,6 +10,8 @@ + + @@ -18,7 +20,7 @@ - select id, name, description, file_path, apply_type, create_time, create_by, update_time, update_by, del_flag from pile_firmware_info + select id, name, description, file_path, apply_type, use_range, download_url, create_time, create_by, update_time, update_by, del_flag from pile_firmware_info