diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidController.java index dbc8078c..5b8d5264 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UserForbidController.java @@ -8,6 +8,7 @@ import com.ruoyi.cai.domain.UserForbid; import com.ruoyi.cai.dto.admin.UserForbidDTO; import com.ruoyi.cai.dto.admin.query.forbid.UserForbidIpReq; import com.ruoyi.cai.dto.admin.vo.UserForbidAdminVo; +import com.ruoyi.cai.dto.admin.vo.userforbid.UserForbidInfo; import com.ruoyi.cai.enums.ForbidTimeEnum; import com.ruoyi.cai.enums.ForbidTypeEnum; import com.ruoyi.cai.manager.UserForbidManager; @@ -58,6 +59,11 @@ public class UserForbidController extends BaseController { return TableDataInfo.build(page); } + @GetMapping("/userForbidInfo") + public R userForbidInfo(@NotNull(message = "主键不能为空") Long userId) { + return R.ok(userForbidService.userForbidInfo(userId)); + } + /** * 获取封号列表详细信息 * diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/userforbid/UserForbidInfo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/userforbid/UserForbidInfo.java new file mode 100644 index 00000000..387f6bd8 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/userforbid/UserForbidInfo.java @@ -0,0 +1,15 @@ +package com.ruoyi.cai.dto.admin.vo.userforbid; + +import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.domain.UserForbid; +import com.ruoyi.cai.domain.UserInfo; +import lombok.Data; + +@Data +public class UserForbidInfo { + private User user; + private UserInfo userInfo; + private UserForbid userForbid; + private UserForbid ipUserForbid; + +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserForbidService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserForbidService.java index 16207e93..6c977134 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserForbidService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserForbidService.java @@ -8,6 +8,7 @@ import com.ruoyi.cai.domain.UserForbidLog; import com.ruoyi.cai.dto.admin.query.UserForbidReq; import com.ruoyi.cai.dto.admin.query.forbid.UserForbidIpReq; import com.ruoyi.cai.dto.admin.vo.UserForbidAdminVo; +import com.ruoyi.cai.dto.admin.vo.userforbid.UserForbidInfo; import com.ruoyi.common.core.domain.PageQuery; /** @@ -21,4 +22,6 @@ public interface UserForbidService extends IService { void forbid(UserForbidLog userForbidLog, User user); Page pageAdmin(PageQuery pageQuery, UserForbidAdminVo bo); + + UserForbidInfo userForbidInfo(Long userId); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java index 7117f39a..acddadf5 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserForbidServiceImpl.java @@ -4,13 +4,11 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.cai.domain.Anchor; -import com.ruoyi.cai.domain.User; -import com.ruoyi.cai.domain.UserForbid; -import com.ruoyi.cai.domain.UserForbidLog; +import com.ruoyi.cai.domain.*; import com.ruoyi.cai.dto.admin.UserForbidDTO; import com.ruoyi.cai.dto.admin.query.forbid.UserForbidIpReq; import com.ruoyi.cai.dto.admin.vo.UserForbidAdminVo; +import com.ruoyi.cai.dto.admin.vo.userforbid.UserForbidInfo; import com.ruoyi.cai.enums.ForbidTimeEnum; import com.ruoyi.cai.enums.ForbidTypeEnum; import com.ruoyi.cai.manager.ForbidCache; @@ -20,6 +18,7 @@ import com.ruoyi.cai.mq.CommonDelayTypeEnum; import com.ruoyi.cai.mq.dto.CommonDelayDto; import com.ruoyi.cai.service.AnchorService; import com.ruoyi.cai.service.UserForbidService; +import com.ruoyi.cai.service.UserInfoService; import com.ruoyi.cai.service.UserService; import com.ruoyi.cai.util.CaiDateUtil; import com.ruoyi.common.core.domain.PageQuery; @@ -49,6 +48,8 @@ public class UserForbidServiceImpl extends ServiceImpl