完成素材用户审核接口

db/sys_user_role.sql

@@ -25,7 +25,7 @@ INSERT INTO sys_user_role(role_sign, role_name, role_description, login_default_
     ('SUPERADMIN', '开发者', '全部权限', '/', 1),
     ('ADMIN', '管理员', '全部功能权限', '/', 2),
     ('DEFAULT', '普通用户', '基础权限', '/', 3),
-    ('MATERIAL_ADMIN', '运营-素材-管理员', '素材管理全权限 (允许查看/下载/上传/删除)', '/material/materialList', 4),
-    ('MATERIAL_USER', '运营-素材-普通用户', '允许查看/下载', '/material/materialList', 5),
-    ('MATERIAL_GUEST', '运营-素材-游客', '允许查看', '/material/materialList', 6)
+    ('MATERIAL_ADMIN', '素材库-管理员', '素材管理全权限 (允许查看/下载/上传/删除)', '/material/materialList', 4),
+    ('MATERIAL_USER', '素材库-普通用户', '允许查看/下载', '/material/materialList', 5),
+    ('MATERIAL_GUEST', '素材库-游客', '允许查看', '/material/materialList', 6)
 ;

src/main/java/com/backendsys/modules/material/entity/MaterialAudit.java

@@ -15,6 +15,9 @@ public class MaterialAudit {
     @RangeArray(message="审核状态取值有误，范围应是(-1审核拒绝, 1待审核, 2审核通过)", value = {"-1", "1", "2"}, groups = { Audit.class })
     private Integer audit_status;
 
+    @RangeArray(message="用户状态取值有误，范围应是(-1禁用, 1启用)", value = {"-1", "1"}, groups = { Audit.class})
+    private Integer status;
+
     private Long role_id;
 
 }

src/main/java/com/backendsys/modules/material/service/impl/MaterialUserServiceImpl.java

@@ -12,6 +12,7 @@ import com.backendsys.modules.system.entity.SysUserDTO;
 import com.backendsys.modules.system.entity.SysUserInfo;
 import com.backendsys.modules.system.entity.SysUserRole;
 import com.backendsys.modules.system.entity.SysUserRoleRelation;
+import com.backendsys.modules.system.service.SysUserService;
 import com.backendsys.utils.response.PageEntity;
 import com.backendsys.utils.response.PageInfoResult;
 import com.backendsys.utils.v2.PageUtils;
@@ -36,6 +37,9 @@ public class MaterialUserServiceImpl implements MaterialUserService {
     @Autowired
     private SysUserRoleRelationDao sysUserRoleRelationDao;
 
+    @Autowired
+    private SysUserService sysUserService;
+
     /**
      * 获取素材用户列表 ({ invite_code = Material })
      */
@@ -79,8 +83,6 @@ public class MaterialUserServiceImpl implements MaterialUserService {
         if (user_info_detail == null) throw new CustException("用户不存在");
 
         // 判断用户是否待审核状态 (-1审核拒绝, 1待审核, 2审核通过)
-//        Integer audit_status = user_info_detail.getAudit_status();
-//        if (audit_status == 2) throw new CustException("用户已通过审核");
         if (materialAudit.getUser_id() == SecurityUtil.getUserId()) throw new CustException("不能审核自己");
 
         // [DB] 获取素材用户角色ID集合
@@ -88,11 +90,17 @@ public class MaterialUserServiceImpl implements MaterialUserService {
         List<Long> role_ids = role_list.stream().map(SysUserRole::getRole_id).toList();
         if (!role_ids.contains(materialAudit.getRole_id())) throw new CustException("必须指定素材用户角色");
 
-        // [DB] 更新用户信息-审核状态
+        // [DB] 更新用户信息-审核状态/用户状态
         SysUserInfo entity = new SysUserInfo();
         entity.setAudit_status(materialAudit.getAudit_status());
+        entity.setStatus(materialAudit.getStatus());
         sysUserInfoDao.update(entity, wrapper);
 
+        // 如果是禁用状态，则清除该用户的登录信息
+        if (materialAudit.getStatus() == -1) {
+            sysUserService.kickUser(materialAudit.getUser_id());
+        }
+
         // [DB] 更新用户与角色关系 (先删，后增)
         LambdaQueryWrapper<SysUserRoleRelation> wrapperRoleRelation = new LambdaQueryWrapper<>();
         wrapperRoleRelation.eq(SysUserRoleRelation::getUser_id, materialAudit.getUser_id());