shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-02-01 18:18:32 +08:00
parent a9d0a51bc1
commit ae6409aa21
19 changed files with 214 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
ruoyi-cai/src/main/java/com/ruoyi/cai/manager/CurrentUserManager.java
View File

@@ -7,16 +7,15 @@ import com.ruoyi.cai.auth.CaiLoginManager;
import com.ruoyi.cai.domain.*;
import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes;
import com.ruoyi.cai.dto.app.query.AnchorUpdateReq;
import com.ruoyi.cai.dto.app.query.UserUpdateReq;
import com.ruoyi.cai.dto.app.query.member.UpdateNoGreet;
import com.ruoyi.cai.dto.app.query.member.UpdateRankHideReq;
import com.ruoyi.cai.dto.app.query.user.UserUpdateAvatarReq;
import com.ruoyi.cai.dto.app.query.user.UserUpdateReq;
import com.ruoyi.cai.dto.app.vo.AnchorVo;
import com.ruoyi.cai.dto.app.vo.CurrentUserInfoVo;
import com.ruoyi.cai.dto.app.vo.user.CurrentUserUpdateInfoVo;
import com.ruoyi.cai.dto.app.vo.user.UserAccountVo;
import com.ruoyi.cai.dto.app.vo.user.UserAlbumDTO;
import com.ruoyi.cai.dto.app.vo.user.UserCountVo;
import com.ruoyi.cai.dto.app.vo.user.*;
import com.ruoyi.cai.enums.AuditStatusEnum;
import com.ruoyi.cai.enums.GenderEnum;
import com.ruoyi.cai.enums.SystemConfigEnum;
import com.ruoyi.cai.enums.user.UserPictureAuditType;
import com.ruoyi.cai.executor.ExecutorConstant;
import com.ruoyi.cai.service.*;
import com.ruoyi.cai.util.UserUtil;
@@ -27,12 +26,14 @@ import com.ruoyi.yunxin.client.ImUserRefClient;
import com.ruoyi.yunxin.req.UpdateUinfoReq;
import com.ruoyi.yunxin.resp.YxCommonR;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@Component
@@ -76,14 +77,30 @@ public class CurrentUserManager {
Long userId = LoginHelper.getUserId();
User user = userService.getById(userId);
CurrentUserUpdateInfoVo res = BeanConvertUtil.convertTo(user, CurrentUserUpdateInfoVo::new);
UserPictureAudit audit = userPictureAuditService.getOneUserAuditRunningPic(UserPictureAuditType.AVATAR.getCode(), res.getUserId());
CurrentUserUpdateInfoVo.Avatar avatar = new CurrentUserUpdateInfoVo.Avatar();
avatar.setAvatar(user.getAvatar());
if(audit == null){
avatar.setAvatar(user.getAvatar());
avatar.setAuditStatus(AuditStatusEnum.SUCCESS.getCode());
} else {
avatar.setAvatar(audit.getUrl());
avatar.setAuditStatus(AuditStatusEnum.AUDITING.getCode());
}
res.setAuditAvatar(avatar);
res.setUserId(userId);
Anchor anchor = anchorService.getByUserId(userId);
res.setOpenVideoStatus(anchor == null ? 1 : anchor.getOpenVideoStatus());
List<UserAlbum> userAlbums = userAlbumService.listByUserId(userId);
res.setUserAlbumList(BeanConvertUtil.convertListTo(userAlbums, UserAlbumDTO::new));
List<UserAlbumAuditVo> userAlbumAuditList = new ArrayList<>();
for (UserAlbum userAlbum : userAlbums) {
UserAlbumAuditVo userAlbumAudit = new UserAlbumAuditVo();
userAlbumAudit.setId(userAlbum.getId());
userAlbumAudit.setUserId(userAlbum.getUserId());
userAlbumAudit.setUrl(userAlbum.getUrl());
userAlbumAudit.setAuditStatus(userAlbum.getAuditStatus());
userAlbumAuditList.add(userAlbumAudit);
}
res.setUserAlbumList(userAlbumAuditList);
return res;
}
@@ -215,5 +232,36 @@ public class CurrentUserManager {
accountBankcardService.saveOrUpdate(bankcard);
}
@Autowired
private UserPictureAuditService userPictureAuditService;
@Autowired
private SystemConfigManager systemConfigManager;
public UserAvatarMinVo updateAvatar(UserUpdateAvatarReq res) {
UserPictureAudit audit = userPictureAuditService.getOneUserAuditRunningPic(UserPictureAuditType.AVATAR.getCode(), res.getUserId());
if(audit != null){
throw new ServiceException("头像正在审核中，请审核后修改");
}
User user = userService.getById(res.getUserId());
boolean ignoreAudit;
if(user.getIsAnchor() == 1){
ignoreAudit = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.ANCHOR_AVATAR_IGNORE_AUDIT);
}else{
ignoreAudit = systemConfigManager.getSystemConfigOfBool(SystemConfigEnum.NO_ANCHOR_AVATAR_IGNORE_AUDIT);
}
UserAvatarMinVo vo = new UserAvatarMinVo();
vo.setAvatar(res.getAvatar());
if(!ignoreAudit){
UserPictureAudit save = new UserPictureAudit();
save.setType(UserPictureAuditType.AVATAR.getCode());
save.setUserId(res.getUserId());
save.setBeforeUrl(user.getAvatar());
save.setUrl(res.getAvatar());
save.setAuditStatus(AuditStatusEnum.AUDITING.getCode());
userPictureAuditService.save(save);
vo.setAuditStatus(AuditStatusEnum.AUDITING.getCode());
}
vo.setAuditStatus(AuditStatusEnum.SUCCESS.getCode());
return vo;
}
}