From 6525935588f4b9a06e08f91dfc9d2895e5ec2c38 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 20 十月 2025 11:00:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java |   53 ++++++++++++++++++++++++-----------------------------
 1 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
index fa0e12a..653bf76 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemPermissionCloudController.java
@@ -5,9 +5,10 @@
 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;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.dao.system.dto.DeleteSystemPermissionDTO;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.Constants;
 import com.doumee.dao.system.dto.QuerySystemPermissionDTO;
 import com.doumee.dao.system.model.SystemPermission;
@@ -28,9 +29,9 @@
  */
 @Api(tags = "绯荤粺鏉冮檺")
 @RestController
-@RequestMapping("/cloudService/system/permission")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/permission")
 public class SystemPermissionCloudController extends BaseController {
-
+ 
     @Autowired
     private SystemPermissionService systemPermissionService;
 
@@ -41,52 +42,46 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @CloudRequiredPermission("system:permission:create")
-    public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @Validated(OperaType.Create.class) @RequestBody SystemPermission systemPermission) {
+    public ApiResponse create(@Validated(Constants.OperaType.Create.class) @RequestBody SystemPermission systemPermission) {
         return ApiResponse.success(systemPermissionBiz.create(systemPermission));
     }
 
     @ApiOperation("鍒犻櫎")
-    @GetMapping("/delete/{id}")
+    @PostMapping("/delete")
     @CloudRequiredPermission("system:permission:delete")
-    public ApiResponse deleteById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@PathVariable Integer id) {
-        systemPermissionBiz.deleteById(id);
+    public ApiResponse deleteById(@RequestBody DeleteSystemPermissionDTO dto) {
+        systemPermissionService.delete(dto);
         return ApiResponse.success(null);
     }
 
     @ApiOperation("鎵归噺鍒犻櫎")
-    @GetMapping("/delete/batch")
+    @PostMapping("/delete/batch")
     @CloudRequiredPermission("system:permission:delete")
-    public ApiResponse deleteByIdInBatch(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam String ids) {
-        String [] idArray = ids.split(",");
-        List<Integer> idList = new ArrayList<>();
-        for (String id : idArray) {
-            idList.add(Integer.valueOf(id));
-        }
-        systemPermissionBiz.deleteByIdInBatch(idList);
+    public ApiResponse deleteByIdInBatch(@RequestBody List<DeleteSystemPermissionDTO> dtos) {
+        systemPermissionService.deleteInBatch(dtos);
         return ApiResponse.success(null);
     }
 
     @ApiOperation("淇敼")
     @PostMapping("/updateById")
     @CloudRequiredPermission("system:permission:update")
-    public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemPermission systemPermission) {
+    public ApiResponse updateById(@Validated(Constants.OperaType.Update.class) @RequestBody SystemPermission systemPermission) {
         systemPermissionBiz.updateById(systemPermission);
         return ApiResponse.success(null);
     }
 
-    @ApiOperation("鍒嗛〉鏌ヨ")
-    @PostMapping("/page")
-    @CloudRequiredPermission("system:permission:query")
-    public ApiResponse<PageData<SystemPermissionListVO>> findPage (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestBody PageWrap<QuerySystemPermissionDTO> pageWrap) {
-        return ApiResponse.success(systemPermissionService.findPage(pageWrap));
+    @ApiOperation("鎵归噺淇敼")
+    @PostMapping("/updateByIdInBatch")
+    @CloudRequiredPermission("system:permission:update")
+    public ApiResponse updateById(@RequestBody List<SystemPermission> permissions) {
+        systemPermissionService.updateByIdInBatch(permissions);
+        return ApiResponse.success(null);
     }
 
-    @ApiOperation("鏌ヨ鎵�鏈�")
-    @GetMapping("/all")
+    @ApiOperation("鏌ヨ鏉冮檺鏍戝垪琛�")
+    @GetMapping("/tree")
     @CloudRequiredPermission("system:permission:query")
-    public ApiResponse<List<SystemPermission>> findAll (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        SystemPermission systemPermission = new SystemPermission();
-        systemPermission.setDeleted(Boolean.FALSE);
-        return ApiResponse.success(systemPermissionService.findList(systemPermission));
+    public ApiResponse<List<SystemPermissionListVO>> findAll () {
+        return ApiResponse.success(systemPermissionService.findTree());
     }
 }

--
Gitblit v1.9.3