From b21857be7a44c8a2ce6ad5ec2733cbeeff437dec Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 20 Mar 2023 17:10:40 +0800
Subject: [PATCH] 修改图片上传
---
src/main/java/org/springblade/modules/modules/controller/FunctionController.java | 22 ++++++++++++++++------
src/main/java/org/springblade/modules/modules/entity/FunctionEntity.java | 4 +++-
2 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/modules/controller/FunctionController.java b/src/main/java/org/springblade/modules/modules/controller/FunctionController.java
index 8953775..dfd175a 100644
--- a/src/main/java/org/springblade/modules/modules/controller/FunctionController.java
+++ b/src/main/java/org/springblade/modules/modules/controller/FunctionController.java
@@ -31,6 +31,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.modules.modules.entity.FunctionEntity;
import org.springblade.modules.modules.service.IFunctionService;
import org.springblade.modules.modules.vo.FunctionVO;
@@ -40,6 +41,8 @@
import org.springblade.core.boot.ctrl.BladeController;
import org.springframework.web.multipart.MultipartFile;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
/**
@@ -151,14 +154,21 @@
*/
@SneakyThrows
@PostMapping("/put-file-attach")
- public R putFileAttach(@RequestParam MultipartFile file) {
+ public R putFileAttach(@RequestParam MultipartFile file,FunctionEntity functionEntity) {
String fileName = file.getOriginalFilename();
+ FunctionEntity one = modulesFunctionService.getOne(Condition.getQueryWrapper(functionEntity));
BladeFile bladeFile = ossBuilder.template().putFile(fileName, file.getInputStream());
-
-
-
-
- return R.success("添加成功");
+ HashMap<String,String> map = new HashMap<>();
+ map.put("label",bladeFile.getName());
+ map.put("value",bladeFile.getLink());
+ List list = new ArrayList();
+ if (ObjectUtil.isNotEmpty(one.getFileUrl())){
+ one.getFileUrl().add(map);
+ }else {
+ list.add(map);
+ one.setFileUrl(list);
+ }
+ return R.data(bladeFile);
}
diff --git a/src/main/java/org/springblade/modules/modules/entity/FunctionEntity.java b/src/main/java/org/springblade/modules/modules/entity/FunctionEntity.java
index d7d46e5..4aec8d7 100644
--- a/src/main/java/org/springblade/modules/modules/entity/FunctionEntity.java
+++ b/src/main/java/org/springblade/modules/modules/entity/FunctionEntity.java
@@ -24,6 +24,8 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
+import java.util.List;
+
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
@@ -69,6 +71,6 @@
*/
@ApiModelProperty(value = "文件链接")
@TableField(value = "file_url",typeHandler = FastjsonTypeHandler.class,updateStrategy = FieldStrategy.IGNORED)
- private Object fileUrl;
+ private List fileUrl;
}
--
Gitblit v1.9.3