更新

src/main/java/com/yj/earth/business/controller/RoleController.java

@@ -1,5 +1,7 @@
 package com.yj.earth.business.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yj.earth.annotation.CheckAuth;
 import com.yj.earth.business.domain.Role;
@@ -14,6 +16,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Tag(name = "角色数据管理")
 @CheckAuth
@@ -33,9 +36,9 @@ public class RoleController {
     }
 
     @Operation(summary = "删除角色")
-    @PostMapping("/delete")
-    public ApiResponse delete(@Parameter(description = "角色ID") String id) {
-        roleService.removeById(id);
+    @PostMapping("/deletes")
+    public ApiResponse deletes(@Parameter(description = "用户ID列表") @RequestBody List<String> ids) {
+        roleService.removeByIds(ids);
         return ApiResponse.success(null);
     }
 
@@ -57,8 +60,30 @@ public class RoleController {
 
     @Operation(summary = "角色列表")
     @GetMapping("/list")
-    public ApiResponse list(@Parameter(description = "分页数量") Integer pageNum, @Parameter(description = "分页大小") Integer pageSize) {
-        Page<Role> rolePage = roleService.page(new Page<>(pageNum, pageSize));
+    public ApiResponse list(@Parameter(description = "分页数量") Integer pageNum,
+                            @Parameter(description = "分页大小") Integer pageSize,
+                            @Parameter(description = "角色名称") String roleName,
+                            @Parameter(description = "角色状态") Integer status) {
+        LambdaQueryWrapper<Role> queryWrapper = new LambdaQueryWrapper<>();
+
+        // 根据角色名称进行模糊搜索
+        if (StringUtils.isNotBlank(roleName)) {
+            queryWrapper.like(Role::getRoleName, roleName);
+        }
+        // 角色状态
+        if (status != null) {
+            queryWrapper.eq(Role::getStatus, status);
+        }
+        Page<Role> rolePage = roleService.page(new Page<>(pageNum, pageSize), queryWrapper);
         return ApiResponse.success(rolePage);
     }
+
+    @Operation(summary = "管理员数量查询")
+    @GetMapping("/count")
+    public ApiResponse count() {
+        LambdaQueryWrapper<Role> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Role::getIsSuper, 1);
+        return ApiResponse.success(roleService.count(queryWrapper));
+    }
+
 }