From af6a08398e2bc22f3c8a3a615cbd9e23190be906 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 12 五月 2022 10:55:44 +0800
Subject: [PATCH] update 优化 文件与图片上传组件 使用id存储回显
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java | 50 ++++++++++++++++++++++----------------------------
1 files changed, 22 insertions(+), 28 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
index e60b4bb..d4e52ac 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@@ -7,22 +7,17 @@
import cn.hutool.http.HttpException;
import cn.hutool.http.HttpUtil;
import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.validate.QueryGroup;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.oss.constant.OssConstant;
-import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.domain.SysOss;
import com.ruoyi.system.domain.bo.SysOssBo;
import com.ruoyi.system.domain.vo.SysOssVo;
-import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysOssService;
import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
@@ -37,6 +32,7 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -45,14 +41,13 @@
* @author Lion Li
*/
@Validated
-@Api(value = "OSS瀵硅薄瀛樺偍鎺у埗鍣�", tags = {"OSS瀵硅薄瀛樺偍绠＄悊"})
+@Api(value = "瀵硅薄瀛樺偍鎺у埗鍣�", tags = {"瀵硅薄瀛樺偍绠＄悊"})
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oss")
public class SysOssController extends BaseController {
private final ISysOssService iSysOssService;
- private final ISysConfigService iSysConfigService;
/**
* 鏌ヨOSS瀵硅薄瀛樺偍鍒楄〃
@@ -65,25 +60,38 @@
}
/**
+ * 鏌ヨOSS瀵硅薄鍩轰簬id涓�
+ */
+ @ApiOperation("鏌ヨOSS瀵硅薄鍩轰簬ID")
+ @SaCheckPermission("system:oss:list")
+ @GetMapping("/listByIds/{ossIds}")
+ public R<List<SysOssVo>> listByIds(@ApiParam("OSS瀵硅薄ID涓�")
+ @NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable Long[] ossIds) {
+ List<SysOssVo> list = iSysOssService.listByIds(Arrays.asList(ossIds));
+ return R.ok(list);
+ }
+
+ /**
* 涓婁紶OSS瀵硅薄瀛樺偍
*/
@ApiOperation("涓婁紶OSS瀵硅薄瀛樺偍")
@ApiImplicitParams({
- @ApiImplicitParam(name = "file", value = "鏂囦欢", dataTypeClass = File.class, required = true),
+ @ApiImplicitParam(name = "file", value = "鏂囦欢", paramType = "query", dataTypeClass = File.class, required = true)
})
@SaCheckPermission("system:oss:upload")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.INSERT)
- @RepeatSubmit
@PostMapping("/upload")
- public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
+ public R<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
if (ObjectUtil.isNull(file)) {
throw new ServiceException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
SysOss oss = iSysOssService.upload(file);
Map<String, String> map = new HashMap<>(2);
map.put("url", oss.getUrl());
- map.put("fileName", oss.getFileName());
- return AjaxResult.success(map);
+ map.put("fileName", oss.getOriginalName());
+ map.put("ossId", oss.getOssId().toString());
+ return R.ok(map);
}
@ApiOperation("涓嬭浇OSS瀵硅薄瀛樺偍")
@@ -117,24 +125,10 @@
@SaCheckPermission("system:oss:remove")
@Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossIds}")
- public AjaxResult<Void> remove(@ApiParam("OSS瀵硅薄ID涓�")
+ public R<Void> remove(@ApiParam("OSS瀵硅薄ID涓�")
@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ossIds) {
return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
- }
-
- /**
- * 鍙樻洿鍥剧墖鍒楄〃棰勮鐘舵��
- */
- @ApiOperation("鍙樻洿鍥剧墖鍒楄〃棰勮鐘舵��")
- @SaCheckPermission("system:oss:edit")
- @Log(title = "OSS瀵硅薄瀛樺偍", businessType = BusinessType.UPDATE)
- @PutMapping("/changePreviewListResource")
- public AjaxResult<Void> changePreviewListResource(@RequestBody String body) {
- Map<String, Boolean> map = JsonUtils.parseMap(body);
- SysConfig config = iSysConfigService.getOne(new SysConfig().setConfigKey(OssConstant.PEREVIEW_LIST_RESOURCE_KEY));
- config.setConfigValue(map.get("previewListResource").toString());
- return toAjax(iSysConfigService.updateConfig(config));
}
}
--
Gitblit v1.9.3