From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 16:30:20 +0800
Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
index 1756ce7..cdba39c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssConfigController.java
@@ -1,9 +1,11 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
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.AddGroup;
import com.ruoyi.common.core.validate.EditGroup;
@@ -12,11 +14,7 @@
import com.ruoyi.system.domain.bo.SysOssConfigBo;
import com.ruoyi.system.domain.vo.SysOssConfigVo;
import com.ruoyi.system.service.ISysOssConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -25,15 +23,14 @@
import java.util.Arrays;
/**
- * 瀵硅薄瀛樺偍閰嶇疆Controller
+ * 瀵硅薄瀛樺偍閰嶇疆
*
* @author Lion Li
* @author 瀛よ垷鐑熼洦
* @date 2021-08-13
*/
@Validated
-@Api(value = "瀵硅薄瀛樺偍閰嶇疆鎺у埗鍣�", tags = {"瀵硅薄瀛樺偍閰嶇疆绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/oss/config")
public class SysOssConfigController extends BaseController {
@@ -43,68 +40,66 @@
/**
* 鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃
*/
- @ApiOperation("鏌ヨ瀵硅薄瀛樺偍閰嶇疆鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:oss:list')")
+ @SaCheckPermission("system:oss:list")
@GetMapping("/list")
- public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo) {
- return iSysOssConfigService.queryPageList(bo);
+ public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
+ return iSysOssConfigService.queryPageList(bo, pageQuery);
}
/**
* 鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅
+ *
+ * @param ossConfigId OSS閰嶇疆ID
*/
- @ApiOperation("鑾峰彇瀵硅薄瀛樺偍閰嶇疆璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:oss:query')")
+ @SaCheckPermission("system:oss:query")
@GetMapping("/{ossConfigId}")
- public AjaxResult<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable("ossConfigId") Integer ossConfigId) {
- return AjaxResult.success(iSysOssConfigService.queryById(ossConfigId));
+ public R<SysOssConfigVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable Long ossConfigId) {
+ return R.ok(iSysOssConfigService.queryById(ossConfigId));
}
/**
* 鏂板瀵硅薄瀛樺偍閰嶇疆
*/
- @ApiOperation("鏂板瀵硅薄瀛樺偍閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:oss:add')")
+ @SaCheckPermission("system:oss:add")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
- public AjaxResult<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
+ public R<Void> add(@Validated(AddGroup.class) @RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.insertByBo(bo) ? 1 : 0);
}
/**
* 淇敼瀵硅薄瀛樺偍閰嶇疆
*/
- @ApiOperation("淇敼瀵硅薄瀛樺偍閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+ @SaCheckPermission("system:oss:edit")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
- public AjaxResult<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
+ public R<Void> edit(@Validated(EditGroup.class) @RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.updateByBo(bo) ? 1 : 0);
}
/**
* 鍒犻櫎瀵硅薄瀛樺偍閰嶇疆
+ *
+ * @param ossConfigIds OSS閰嶇疆ID涓�
*/
- @ApiOperation("鍒犻櫎瀵硅薄瀛樺偍閰嶇疆")
- @PreAuthorize("@ss.hasPermi('system:oss:remove')")
+ @SaCheckPermission("system:oss:remove")
@Log(title = "瀵硅薄瀛樺偍閰嶇疆", businessType = BusinessType.DELETE)
@DeleteMapping("/{ossConfigIds}")
- public AjaxResult<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
- @PathVariable Long[] ossConfigIds) {
+ public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
+ @PathVariable Long[] ossConfigIds) {
return toAjax(iSysOssConfigService.deleteWithValidByIds(Arrays.asList(ossConfigIds), true) ? 1 : 0);
}
/**
* 鐘舵�佷慨鏀�
*/
- @ApiOperation("鐘舵�佷慨鏀�")
- @PreAuthorize("@ss.hasPermi('system:oss:edit')")
+ @SaCheckPermission("system:oss:edit")
@Log(title = "瀵硅薄瀛樺偍鐘舵�佷慨鏀�", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus")
- public AjaxResult<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
+ public R<Void> changeStatus(@RequestBody SysOssConfigBo bo) {
return toAjax(iSysOssConfigService.updateOssConfigStatus(bo));
}
}
--
Gitblit v1.9.3