From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
index 19af08e..7d0dcbc 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDictCloudController.java
@@ -2,6 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.biz.system.SystemDictBiz;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.OperaType;
import com.doumee.core.model.ApiResponse;
@@ -14,7 +15,6 @@
import com.doumee.service.system.SystemDictService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -28,7 +28,7 @@
*/
@Api(tags = "绯荤粺瀛楀吀")
@RestController
-@RequestMapping("/cloudService/system/dict")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/dict")
public class SystemDictCloudController extends BaseController {
@Autowired
@@ -40,14 +40,15 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("system:dict:create")
+ @CloudRequiredPermission("system:dict:create")
public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemDict systemDict) {
+ systemDict.setCreateUser(this.getLoginUser(token).getId());
return ApiResponse.success(systemDictBiz.create(systemDict));
}
@ApiOperation("鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("system:dict:delete")
+ @CloudRequiredPermission("system:dict:delete")
public ApiResponse deleteById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@PathVariable Integer id) {
systemDictService.deleteById(id);
return ApiResponse.success(null);
@@ -55,7 +56,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("system:dict:delete")
+ @CloudRequiredPermission("system:dict:delete")
public ApiResponse deleteByIdInBatch(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -68,15 +69,16 @@
@ApiOperation("淇敼")
@PostMapping("/updateById")
- @RequiresPermissions("system:dict:update")
+ @CloudRequiredPermission("system:dict:update")
public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDict systemDict) {
+ systemDict.setUpdateUser(this.getLoginUser(token).getId());
systemDictBiz.updateById(systemDict);
return ApiResponse.success(null);
}
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("system:dict:query")
+ @CloudRequiredPermission("system:dict:query")
public ApiResponse<PageData<SystemDictListVO>> findPage (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestBody PageWrap<QuerySystemDictDTO> pageWrap) {
return ApiResponse.success(systemDictService.findPage(pageWrap));
}
--
Gitblit v1.9.3