From a549c461f94e2d50499247aca964cae6a68e158e Mon Sep 17 00:00:00 2001
From: zhangbaojian <1065122561@qq.com>
Date: Tue, 30 May 2023 11:29:54 +0800
Subject: [PATCH] =?UTF-8?q?zbj//1.=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pqs-device/device-boot/src/main/resources/bootstrap.yml       | 4 ++--
 .../com/njcn/device/pq/controller/ResourceController.java     | 2 +-
 .../com/njcn/device/pq/service/impl/ResourceServiceImpl.java  | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pqs-device/device-boot/src/main/resources/bootstrap.yml b/pqs-device/device-boot/src/main/resources/bootstrap.yml
index 0b6f730ee..863f6dd99 100644
--- a/pqs-device/device-boot/src/main/resources/bootstrap.yml
+++ b/pqs-device/device-boot/src/main/resources/bootstrap.yml
@@ -39,9 +39,9 @@ spring:
   servlet:
     multipart:
       #上传文件总的最大值
-      max-request-size: 10MB
+      max-request-size: 200MB
       #上传文件的最大值
-      max-file-size: 10MB
+      max-file-size: 200MB
 
 #项目日志的配置
 #项目日志的配置
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java
index d04fc2aa8..ff8167e86 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/ResourceController.java
@@ -211,7 +211,7 @@ public class ResourceController extends BaseController {
     @ApiOperation("修改资源")
     public HttpResult<Boolean> updateFile(@ApiParam(value = "id", required = true) String id,
                                           @ApiParam(value = "文件", required = false)  MultipartFile multipartFile,
-                                          @ApiParam(value = "文件", required = false)  MultipartFile picture,
+                                          @ApiParam(value = "图片", required = false)  MultipartFile picture,
                                           @ApiParam(value = "资源名称", required = false) String name,
                                           @ApiParam(value = "资源状态", required = false) Integer state,
                                           @ApiParam(value = "资源类型", required = false) Integer type) {
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java
index b303a7eda..d59cd7e0e 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/ResourceServiceImpl.java
@@ -72,6 +72,7 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, ResourceDat
             list = this.list();
         }
         for (ResourceData resourceData : list) {
+            resourceData.setResUrl(fileStorageUtil.getFileUrl(resourceData.getResUrl()));
             if (StringUtils.isNotBlank(resourceData.getPicUrl())) {
                 resourceData.setPicUrl(fileStorageUtil.getFileUrl(resourceData.getPicUrl()));
             }
@@ -200,7 +201,7 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, ResourceDat
         if (null != picture && !picture.isEmpty()) {
             if (StringUtils.isNotBlank(resourceData.getPicUrl())) {
                 //删除图片
-                fileStorageUtil.deleteFile(resourceData.getResUrl());
+                fileStorageUtil.deleteFile(resourceData.getPicUrl());
             }
             //获取路径
             String picUrl = fileStorageUtil.uploadMultipart(picture, OssPath.RESOURCEDATA);