diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorController.java index 5ca8b350..96e18ce4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/AnchorController.java @@ -4,14 +4,13 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import com.baomidou.mybatisplus.core.metadata.IPage; import com.ruoyi.cai.domain.Anchor; import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.domain.UserCameraAudit; import com.ruoyi.cai.domain.UserOnline; import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo; import com.ruoyi.cai.dto.admin.vo.AnchorFullAdminVo; +import com.ruoyi.cai.enums.AuditStatusEnum; import com.ruoyi.cai.notice.YunxinHttpService; -import com.ruoyi.cai.service.AnchorService; -import com.ruoyi.cai.service.UserInfoService; -import com.ruoyi.cai.service.UserOnlineService; -import com.ruoyi.cai.service.UserService; +import com.ruoyi.cai.service.*; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.core.controller.BaseController; @@ -43,6 +42,7 @@ public class AnchorController extends BaseController { private final UserService userService; private final UserInfoService userInfoService; private final UserOnlineService userOnlineService; + private final UserCameraAuditService userCameraAuditService; /** * 查询女神列表列表 @@ -67,6 +67,8 @@ public class AnchorController extends BaseController { return R.ok(anchorService.getById(id)); } + + @GetMapping("/full") public R getInfo(@NotNull(message = "主键不能为空") Long userId) { @@ -75,6 +77,13 @@ public class AnchorController extends BaseController { vo.setAnchor(anchorService.getByUserId(userId)); vo.setUserOnline(userOnlineService.getByUserId(userId)); vo.setUserInfo(userInfoService.getByUserId(userId)); + User user = vo.getUser(); + if(user != null && user.getCameraStatus() == 1){ + UserCameraAudit userCameraAudit = userCameraAuditService.getByUserId(userId); + if(userCameraAudit != null && AuditStatusEnum.SUCCESS.getCode().equals(userCameraAudit.getAuditStatus())){ + vo.setUserCameraAudit(userCameraAudit); + } + } return R.ok(vo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorFullAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorFullAdminVo.java index 0e497802..ea1c49fa 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorFullAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/AnchorFullAdminVo.java @@ -1,9 +1,6 @@ package com.ruoyi.cai.dto.admin.vo; -import com.ruoyi.cai.domain.Anchor; -import com.ruoyi.cai.domain.User; -import com.ruoyi.cai.domain.UserInfo; -import com.ruoyi.cai.domain.UserOnline; +import com.ruoyi.cai.domain.*; import lombok.Data; @Data @@ -12,4 +9,5 @@ public class AnchorFullAdminVo { private Anchor anchor; private UserOnline userOnline; private UserInfo userInfo; + private UserCameraAudit userCameraAudit; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserFullAdminVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserFullAdminVo.java index f528630e..0c247410 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserFullAdminVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/UserFullAdminVo.java @@ -8,6 +8,7 @@ import java.util.List; @Data public class UserFullAdminVo { private User user; + private UserCameraAudit userCameraAudit; private UserInfo userInfo; private Account account; private Anchor anchor; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java index f69b07bd..556e5b21 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/UserAdminManager.java @@ -2,11 +2,13 @@ package com.ruoyi.cai.manager; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.cai.domain.User; +import com.ruoyi.cai.domain.UserCameraAudit; import com.ruoyi.cai.domain.UserCount; import com.ruoyi.cai.domain.UserOnline; import com.ruoyi.cai.dto.admin.query.UpdateMobileAdminReq; import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq; import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo; +import com.ruoyi.cai.enums.AuditStatusEnum; import com.ruoyi.cai.enums.SystemConfigEnum; import com.ruoyi.cai.im.ImManager; import com.ruoyi.cai.service.*; @@ -76,6 +78,9 @@ public class UserAdminManager { return true; } + @Autowired + private UserCameraAuditService userCameraAuditService; + public UserFullAdminVo getUser(Long id) { UserFullAdminVo vo = new UserFullAdminVo(); vo.setUser(userService.getById(id)); @@ -87,6 +92,13 @@ public class UserAdminManager { vo.setUserCount(userCountService.getByUserId(id)); vo.setUserAlbums(userAlbumService.listByUserId(id)); vo.setUserMember(userMemberService.getByUserId(id)); + User user = vo.getUser(); + if(user != null && user.getCameraStatus() == 1){ + UserCameraAudit userCameraAudit = userCameraAuditService.getByUserId(id); + if(userCameraAudit != null && AuditStatusEnum.SUCCESS.getCode().equals(userCameraAudit.getAuditStatus())){ + vo.setUserCameraAudit(userCameraAudit); + } + } return vo; } }