init

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/ForbidFilterController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.ForbidFilter;
+import com.ruoyi.cai.dto.admin.vo.ForbidFilterAdminVo;
 import com.ruoyi.cai.service.ForbidFilterService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +42,8 @@ public class ForbidFilterController extends BaseController {
      */
     @SaCheckPermission("cai:forbidFilter:list")
     @GetMapping("/list")
-    public TableDataInfo<ForbidFilter> list(ForbidFilter bo, PageQuery pageQuery) {
-        Page<ForbidFilter> page = forbidFilterService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+    public TableDataInfo<ForbidFilterAdminVo> list(ForbidFilterAdminVo bo, PageQuery pageQuery) {
+        Page<ForbidFilterAdminVo> page = forbidFilterService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserController.java

@@ -6,10 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.dto.admin.query.ResetPasswordReq;
 import com.ruoyi.cai.dto.admin.query.UpdateMobileAdminReq;
+import com.ruoyi.cai.dto.admin.query.UserForbidReq;
 import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
 import com.ruoyi.cai.dto.admin.vo.UserAdminVo;
 import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo;
 import com.ruoyi.cai.manager.UserAdminManager;
+import com.ruoyi.cai.manager.UserForbidManager;
+import com.ruoyi.cai.service.UserForbidService;
 import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -22,6 +25,7 @@ import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import lombok.RequiredArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -71,6 +75,16 @@ public class UserController extends BaseController {
         return R.ok(users.stream().map(User::getUsercode).collect(Collectors.toList()));
     }
 
+    @Autowired
+    private UserForbidManager userForbidManager;
+
+
+    @PostMapping("/userForbid")
+    public R<Void> userForbid(@RequestBody UserForbidReq userForbidReq){
+        userForbidManager.batchForbid(userForbidReq);
+        return R.ok();
+    }
+
 
     /**
      * 获取用户详细信息

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidController.java

@@ -4,6 +4,8 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserForbid;
+import com.ruoyi.cai.dto.admin.vo.UserForbidAdminVo;
+import com.ruoyi.cai.manager.UserForbidManager;
 import com.ruoyi.cai.service.UserForbidService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -15,6 +17,7 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -35,14 +38,16 @@ import java.util.Arrays;
 public class UserForbidController extends BaseController {
 
     private final UserForbidService userForbidService;
+    @Autowired
+    private UserForbidManager userForbidManager;
 
     /**
      * 查询封号列表列表
      */
     @SaCheckPermission("cai:userForbid:list")
     @GetMapping("/list")
-    public TableDataInfo<UserForbid> list(UserForbid bo, PageQuery pageQuery) {
-        Page<UserForbid> page = userForbidService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+    public TableDataInfo<UserForbidAdminVo> list(UserForbidAdminVo bo, PageQuery pageQuery) {
+        Page<UserForbidAdminVo> page = userForbidService.pageAdmin(pageQuery, bo);
         return TableDataInfo.build(page);
     }
 
@@ -69,6 +74,14 @@ public class UserForbidController extends BaseController {
         return toAjax(userForbidService.save(bo));
     }
 
+    @Log(title = "解封", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @GetMapping("/un/forbid")
+    public R<Void> unForbid(Long id) {
+        userForbidManager.unForbidByForbidId(id);
+        return R.ok();
+    }
+
     /**
      * 修改封号列表
      */

ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/UserForbidLogController.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.UserForbidLog;
+import com.ruoyi.cai.dto.admin.vo.UserForbidLogAdminVo;
 import com.ruoyi.cai.service.UserForbidLogService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,8 +42,8 @@ public class UserForbidLogController extends BaseController {
      */
     @SaCheckPermission("cai:userForbidLog:list")
     @GetMapping("/list")
-    public TableDataInfo<UserForbidLog> list(UserForbidLog bo, PageQuery pageQuery) {
-        Page<UserForbidLog> page = userForbidLogService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+    public TableDataInfo<UserForbidLogAdminVo> list(UserForbidLogAdminVo bo, PageQuery pageQuery) {
+        Page<UserForbidLogAdminVo> page = userForbidLogService.pageAdmin(pageQuery,bo);
         return TableDataInfo.build(page);
     }