From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
similarity index 74%
rename from ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
rename to ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
index 8a84c42..c7772ab 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/system/controller/SysOssController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java
@@ -1,20 +1,26 @@
-package com.ruoyi.system.controller;
+package com.ruoyi.web.controller.system;
import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.HttpUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.exception.CustomException;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.system.domain.bo.SysOssBo;
+import com.ruoyi.oss.constant.CloudConstant;
+import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.domain.SysOss;
-import com.ruoyi.system.service.ISysOssService;
+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.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -49,6 +55,7 @@
public class SysOssController extends BaseController {
private final ISysOssService iSysOssService;
+ private final ISysConfigService iSysConfigService;
/**
* 鏌ヨOSS浜戝瓨鍌ㄥ垪琛�
@@ -72,8 +79,8 @@
@RepeatSubmit
@PostMapping("/upload")
public AjaxResult<Map<String, String>> upload(@RequestPart("file") MultipartFile file) {
- if (file.isEmpty()) {
- throw new CustomException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
+ if (ObjectUtil.isNull(file)) {
+ throw new ServiceException("涓婁紶鏂囦欢涓嶈兘涓虹┖");
}
SysOss oss = iSysOssService.upload(file);
Map<String, String> map = new HashMap<>(2);
@@ -87,8 +94,8 @@
@GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
SysOss sysOss = iSysOssService.getById(ossId);
- if (sysOss == null) {
- throw new CustomException("鏂囦欢鏁版嵁涓嶅瓨鍦�!");
+ if (ObjectUtil.isNull(sysOss)) {
+ throw new ServiceException("鏂囦欢鏁版嵁涓嶅瓨鍦�!");
}
response.reset();
response.addHeader("Access-Control-Allow-Origin", "*");
@@ -111,4 +118,19 @@
return toAjax(iSysOssService.deleteWithValidByIds(Arrays.asList(ossIds), true) ? 1 : 0);
}
+ /**
+ * 鍙樻洿鍥剧墖鍒楄〃棰勮鐘舵��
+ */
+ @ApiOperation("鍙樻洿鍥剧墖鍒楄〃棰勮鐘舵��")
+ @PreAuthorize("@ss.hasPermi('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 LambdaQueryWrapper<SysConfig>()
+ .eq(SysConfig::getConfigKey, CloudConstant.PEREVIEW_LIST_RESOURCE_KEY));
+ config.setConfigValue(map.get("previewListResource").toString());
+ return toAjax(iSysConfigService.updateConfig(config));
+ }
+
}
--
Gitblit v1.9.3