123
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user