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/system/SystemPermissionController.java |   55 +++++++++++++++++++++++--------------------------------
 1 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java
index 327e24a..22048ee 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemPermissionController.java
@@ -3,11 +3,8 @@
 import com.doumee.api.BaseController;
 import com.doumee.biz.system.SystemPermissionBiz;
 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.QuerySystemPermissionDTO;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.system.dto.DeleteSystemPermissionDTO;
 import com.doumee.dao.system.model.SystemPermission;
 import com.doumee.dao.system.vo.SystemPermissionListVO;
 import com.doumee.service.system.SystemPermissionService;
@@ -18,12 +15,12 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
+import com.doumee.service.business.third.model.ApiResponse;
 
 /**
- * @author Eva.Caesar Liu
- * @date 2023/03/21 14:49
+ * @author  dm
+ * @since 2025/03/31 16:44
  */
 @Api(tags = "绯荤粺鏉冮檺")
 @RestController
@@ -40,52 +37,46 @@
     @ApiOperation("鏂板缓")
     @PostMapping("/create")
     @RequiresPermissions("system:permission:create")
-    public ApiResponse create(@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")
     @RequiresPermissions("system:permission:delete")
-    public ApiResponse deleteById(@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")
     @RequiresPermissions("system:permission:delete")
-    public ApiResponse deleteByIdInBatch(@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")
     @RequiresPermissions("system:permission:update")
-    public ApiResponse updateById(@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")
-    @RequiresPermissions("system:permission:query")
-    public ApiResponse<PageData<SystemPermissionListVO>> findPage (@RequestBody PageWrap<QuerySystemPermissionDTO> pageWrap) {
-        return ApiResponse.success(systemPermissionService.findPage(pageWrap));
+    @ApiOperation("鎵归噺淇敼")
+    @PostMapping("/updateByIdInBatch")
+    @RequiresPermissions("system:permission:update")
+    public ApiResponse updateById(@RequestBody List<SystemPermission> permissions) {
+        systemPermissionService.updateByIdInBatch(permissions);
+        return ApiResponse.success(null);
     }
 
-    @ApiOperation("鏌ヨ鎵�鏈�")
-    @GetMapping("/all")
+    @ApiOperation("鏌ヨ鏉冮檺鏍戝垪琛�")
+    @GetMapping("/tree")
     @RequiresPermissions("system:permission:query")
-    public ApiResponse<List<SystemPermission>> findAll () {
-        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