123
This commit is contained in:
@@ -4,14 +4,13 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.ruoyi.cai.domain.Anchor;
|
import com.ruoyi.cai.domain.Anchor;
|
||||||
import com.ruoyi.cai.domain.User;
|
import com.ruoyi.cai.domain.User;
|
||||||
|
import com.ruoyi.cai.domain.UserCameraAudit;
|
||||||
import com.ruoyi.cai.domain.UserOnline;
|
import com.ruoyi.cai.domain.UserOnline;
|
||||||
import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
|
import com.ruoyi.cai.dto.admin.vo.AnchorAdminVo;
|
||||||
import com.ruoyi.cai.dto.admin.vo.AnchorFullAdminVo;
|
import com.ruoyi.cai.dto.admin.vo.AnchorFullAdminVo;
|
||||||
|
import com.ruoyi.cai.enums.AuditStatusEnum;
|
||||||
import com.ruoyi.cai.notice.YunxinHttpService;
|
import com.ruoyi.cai.notice.YunxinHttpService;
|
||||||
import com.ruoyi.cai.service.AnchorService;
|
import com.ruoyi.cai.service.*;
|
||||||
import com.ruoyi.cai.service.UserInfoService;
|
|
||||||
import com.ruoyi.cai.service.UserOnlineService;
|
|
||||||
import com.ruoyi.cai.service.UserService;
|
|
||||||
import com.ruoyi.common.annotation.Log;
|
import com.ruoyi.common.annotation.Log;
|
||||||
import com.ruoyi.common.annotation.RepeatSubmit;
|
import com.ruoyi.common.annotation.RepeatSubmit;
|
||||||
import com.ruoyi.common.core.controller.BaseController;
|
import com.ruoyi.common.core.controller.BaseController;
|
||||||
@@ -43,6 +42,7 @@ public class AnchorController extends BaseController {
|
|||||||
private final UserService userService;
|
private final UserService userService;
|
||||||
private final UserInfoService userInfoService;
|
private final UserInfoService userInfoService;
|
||||||
private final UserOnlineService userOnlineService;
|
private final UserOnlineService userOnlineService;
|
||||||
|
private final UserCameraAuditService userCameraAuditService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 查询女神列表列表
|
* 查询女神列表列表
|
||||||
@@ -67,6 +67,8 @@ public class AnchorController extends BaseController {
|
|||||||
return R.ok(anchorService.getById(id));
|
return R.ok(anchorService.getById(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@GetMapping("/full")
|
@GetMapping("/full")
|
||||||
public R<AnchorFullAdminVo> getInfo(@NotNull(message = "主键不能为空")
|
public R<AnchorFullAdminVo> getInfo(@NotNull(message = "主键不能为空")
|
||||||
Long userId) {
|
Long userId) {
|
||||||
@@ -75,6 +77,13 @@ public class AnchorController extends BaseController {
|
|||||||
vo.setAnchor(anchorService.getByUserId(userId));
|
vo.setAnchor(anchorService.getByUserId(userId));
|
||||||
vo.setUserOnline(userOnlineService.getByUserId(userId));
|
vo.setUserOnline(userOnlineService.getByUserId(userId));
|
||||||
vo.setUserInfo(userInfoService.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);
|
return R.ok(vo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,6 @@
|
|||||||
package com.ruoyi.cai.dto.admin.vo;
|
package com.ruoyi.cai.dto.admin.vo;
|
||||||
|
|
||||||
import com.ruoyi.cai.domain.Anchor;
|
import com.ruoyi.cai.domain.*;
|
||||||
import com.ruoyi.cai.domain.User;
|
|
||||||
import com.ruoyi.cai.domain.UserInfo;
|
|
||||||
import com.ruoyi.cai.domain.UserOnline;
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@@ -12,4 +9,5 @@ public class AnchorFullAdminVo {
|
|||||||
private Anchor anchor;
|
private Anchor anchor;
|
||||||
private UserOnline userOnline;
|
private UserOnline userOnline;
|
||||||
private UserInfo userInfo;
|
private UserInfo userInfo;
|
||||||
|
private UserCameraAudit userCameraAudit;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import java.util.List;
|
|||||||
@Data
|
@Data
|
||||||
public class UserFullAdminVo {
|
public class UserFullAdminVo {
|
||||||
private User user;
|
private User user;
|
||||||
|
private UserCameraAudit userCameraAudit;
|
||||||
private UserInfo userInfo;
|
private UserInfo userInfo;
|
||||||
private Account account;
|
private Account account;
|
||||||
private Anchor anchor;
|
private Anchor anchor;
|
||||||
|
|||||||
@@ -2,11 +2,13 @@ package com.ruoyi.cai.manager;
|
|||||||
|
|
||||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||||
import com.ruoyi.cai.domain.User;
|
import com.ruoyi.cai.domain.User;
|
||||||
|
import com.ruoyi.cai.domain.UserCameraAudit;
|
||||||
import com.ruoyi.cai.domain.UserCount;
|
import com.ruoyi.cai.domain.UserCount;
|
||||||
import com.ruoyi.cai.domain.UserOnline;
|
import com.ruoyi.cai.domain.UserOnline;
|
||||||
import com.ruoyi.cai.dto.admin.query.UpdateMobileAdminReq;
|
import com.ruoyi.cai.dto.admin.query.UpdateMobileAdminReq;
|
||||||
import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
|
import com.ruoyi.cai.dto.admin.query.UserUpdateAdminReq;
|
||||||
import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo;
|
import com.ruoyi.cai.dto.admin.vo.UserFullAdminVo;
|
||||||
|
import com.ruoyi.cai.enums.AuditStatusEnum;
|
||||||
import com.ruoyi.cai.enums.SystemConfigEnum;
|
import com.ruoyi.cai.enums.SystemConfigEnum;
|
||||||
import com.ruoyi.cai.im.ImManager;
|
import com.ruoyi.cai.im.ImManager;
|
||||||
import com.ruoyi.cai.service.*;
|
import com.ruoyi.cai.service.*;
|
||||||
@@ -76,6 +78,9 @@ public class UserAdminManager {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Autowired
|
||||||
|
private UserCameraAuditService userCameraAuditService;
|
||||||
|
|
||||||
public UserFullAdminVo getUser(Long id) {
|
public UserFullAdminVo getUser(Long id) {
|
||||||
UserFullAdminVo vo = new UserFullAdminVo();
|
UserFullAdminVo vo = new UserFullAdminVo();
|
||||||
vo.setUser(userService.getById(id));
|
vo.setUser(userService.getById(id));
|
||||||
@@ -87,6 +92,13 @@ public class UserAdminManager {
|
|||||||
vo.setUserCount(userCountService.getByUserId(id));
|
vo.setUserCount(userCountService.getByUserId(id));
|
||||||
vo.setUserAlbums(userAlbumService.listByUserId(id));
|
vo.setUserAlbums(userAlbumService.listByUserId(id));
|
||||||
vo.setUserMember(userMemberService.getByUserId(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;
|
return vo;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user