moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

头像-后台-手动上传后要清理掉审核中状态

Browse Source
This commit is contained in:
khalil
2025-04-18 18:18:01 +08:00
parent dca72514a6
commit ea91d2939b
5 changed files with 85 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/UserCheckAdminService.java
View File

@@ -10,6 +10,7 @@ import com.accompany.business.model.UserPurse;
import com.accompany.business.mybatismapper.PrivatePhotoMapper;
import com.accompany.business.mybatismapper.UserInviteCodeMapper;
import com.accompany.business.service.AccountLoginRecordService;
import com.accompany.business.service.UploadAvatarService;
import com.accompany.business.service.family.FamilyClanService;
import com.accompany.business.service.invite.UserInviteCodeService;
import com.accompany.business.service.purse.UserPurseService;
@@ -89,6 +90,8 @@ public class UserCheckAdminService {
private RoomService roomService;
private Gson gson = new Gson();
@Autowired
private UploadAvatarService uploadAvatarService;
public List<UsersAdminVo> getUsersList(String erbanNoList,Integer type){
List<String> oldList = Arrays.asList(erbanNoList.split(","));
@@ -218,49 +221,52 @@ public class UserCheckAdminService {
Users users = usersMapper.selectByPrimaryKey(uid);
if(users == null){
throw new AdminServiceException("未找到该用户信息");
}else {
if (StringUtils.isNotBlank(nick)) {
users.setNick(nick);
}
users.setGender(gender==1?new Byte("1"):new Byte("2"));
if (StringUtils.isNotBlank(avatar)) {
users.setAvatar(avatar);
}
if (StringUtils.isNotBlank(phone)) {
// 如果传入不为空，则更新
users.setPhone(phone);
}
users.setUserDesc(userDesc);
users.setUpdateTime(new Date());
needChangePartition = partitionId != null && !partitionId.equals(users.getPartitionId());
if (needChangePartition){
UserPurse userPurse = userPurseService.queryUserPurse(users.getUid());
if (userPurse.getDiamonds() > 0d){
throw new AdminServiceException("用户金币余额不为0，不能改变分区");
} else if (userPurse.getGolds() > 0d) {
throw new AdminServiceException("用户钻石余额不为0，不能改变分区");
} else if (userPurse.getGuildUsd() > 0d){
throw new AdminServiceException("用户金币公会薪资不为0，不能改变分区");
}
FamilyClanDecorateVo clanVo = familyClanService.getFamilyClanDecorateVo(users.getUid(), users.getUid());
if ((null != clanVo.getClan() && null != clanVo.getClan().getHall())
|| (null != clanVo.getFamily() && null != clanVo.getFamily().getFamilyId())){
throw new AdminServiceException("用户拥有主播角色");
}
users.setPartitionId(partitionId);
if (regionId != null) {
RegionInfo regionInfo = regionInfoService.getById(regionId);
if (regionInfo != null && !regionInfo.getPartitionId().equals(partitionId)) {
throw new AdminServiceException("国家与地区不一致");
}
}
}
users.setRegionId(regionId);
usersMapper.updateByPrimaryKey(users);
}
boolean avatarUpdate = !users.getAvatar().equals(avatar);
if (StringUtils.isNotBlank(nick)) {
users.setNick(nick);
}
users.setGender(gender==1?new Byte("1"):new Byte("2"));
if (StringUtils.isNotBlank(avatar)) {
users.setAvatar(avatar);
}
if (StringUtils.isNotBlank(phone)) {
// 如果传入不为空，则更新
users.setPhone(phone);
}
users.setUserDesc(userDesc);
users.setUpdateTime(new Date());
needChangePartition = partitionId != null && !partitionId.equals(users.getPartitionId());
if (needChangePartition){
UserPurse userPurse = userPurseService.queryUserPurse(users.getUid());
if (userPurse.getDiamonds() > 0d){
throw new AdminServiceException("用户金币余额不为0，不能改变分区");
} else if (userPurse.getGolds() > 0d) {
throw new AdminServiceException("用户钻石余额不为0，不能改变分区");
} else if (userPurse.getGuildUsd() > 0d){
throw new AdminServiceException("用户金币公会薪资不为0，不能改变分区");
}
FamilyClanDecorateVo clanVo = familyClanService.getFamilyClanDecorateVo(users.getUid(), users.getUid());
if ((null != clanVo.getClan() && null != clanVo.getClan().getHall())
|| (null != clanVo.getFamily() && null != clanVo.getFamily().getFamilyId())){
throw new AdminServiceException("用户拥有主播角色");
}
users.setPartitionId(partitionId);
if (regionId != null) {
RegionInfo regionInfo = regionInfoService.getById(regionId);
if (regionInfo != null && !regionInfo.getPartitionId().equals(partitionId)) {
throw new AdminServiceException("国家与地区不一致");
}
}
}
users.setRegionId(regionId);
usersMapper.updateByPrimaryKey(users);
// 网易云信的更新
String uidStr = String.valueOf(users.getUid());
BaseNetEaseRet baseNetEaseRet = erbanNetEaseService.updateUserInfoForUserAdmin(uidStr,gender,avatar,nick);
@@ -294,8 +300,11 @@ public class UserCheckAdminService {
}
}
jedisService.del(RedisKey.private_photo.getKey() + uid);
BusiResult<Users> busiResult = new BusiResult<>(BusiStatus.SUCCESS);
busiResult.setData(users);
if (avatarUpdate){
uploadAvatarService.delReviewAvatar(RedisKey.room_avatar_under_review.getKey(), uid.toString());
}
// redis更新
delUserCache(users);
@@ -303,7 +312,7 @@ public class UserCheckAdminService {
applicationContext.publishEvent(new UsersChangePartitionEvent(users));
}
return busiResult;
return BusiResult.success(users);
}
public BusiResult removePhone(String phone,Long uid){
BusiResult<Account> busiResult = new BusiResult<>(BusiStatus.SUCCESS);

12
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java
View File

@@ -10,11 +10,13 @@ import com.accompany.business.event.FamilyMemberStatusChangeEvent;
import com.accompany.business.event.NewGuildEvent;
import com.accompany.business.message.NewGuildMessage;
import com.accompany.business.model.family.*;
import com.accompany.business.service.UploadAvatarService;
import com.accompany.business.service.family.*;
import com.accompany.business.service.room.FamilyMemberRoomMicRecordService;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.vo.family.FamilyMemberAdminVo;
import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
import com.accompany.core.exception.AdminServiceException;
@@ -70,6 +72,8 @@ public class FamilyManageAdminService {
private RegionInfoService regionInfoService;
@Autowired
private AdminUserService adminUserService;
@Autowired
private UploadAvatarService uploadAvatarService;
@Transactional(rollbackFor = Exception.class)
public void createFamily(Long erbanNo, String referrer, Long inviteErbanNo) {
@@ -153,6 +157,14 @@ public class FamilyManageAdminService {
.set(StringUtils.isNotBlank(backgroundUrl), Family::getBackgroundUrl, backgroundUrl)
.set(null != memberNumLimit, Family::getMemberNumLimit, memberNumLimit)
.update();
boolean avatarUpdate = !family.getAvatar().equals(avatar);
if (!avatarUpdate){
return;
}
uploadAvatarService.delReviewAvatar(RedisKey.family_avatar_under_review.getKey(), family.getOwnerUid().toString());
}
public Page<FamilyAdminVo> pageFamily(Long erbanNo, String referrer,

11
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java
View File

@@ -12,6 +12,7 @@ import com.accompany.business.model.guild.Guild;
import com.accompany.business.model.guild.GuildApply;
import com.accompany.business.model.guild.GuildMember;
import com.accompany.business.model.guild.GuildOperateRecord;
import com.accompany.business.service.UploadAvatarService;
import com.accompany.business.service.guild.GuildMemberService;
import com.accompany.business.service.guild.GuildMessageService;
import com.accompany.business.service.guild.GuildOperateRecordService;
@@ -19,6 +20,7 @@ import com.accompany.business.service.guild.GuildService;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.vo.guild.GuildOperateRecordAdminVo;
import com.accompany.common.constant.Constant;
import com.accompany.common.redis.RedisKey;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
import com.accompany.common.utils.DateTimeUtil;
@@ -65,6 +67,8 @@ public class GuildManageAdminService {
private ApplicationContext applicationContext;
@Autowired
private RegionInfoService regionInfoService;
@Autowired
private UploadAvatarService uploadAvatarService;
@Transactional(rollbackFor = Exception.class)
public void createGuild(Long erbanNo, Integer adminId, Long inviteErbanNo) {
@@ -168,6 +172,13 @@ public class GuildManageAdminService {
.set(StringUtils.isNotBlank(backgroundUrl), Guild::getBackgroundUrl, backgroundUrl)
.set(null != memberNumLimit, Guild::getMemberNumLimit, memberNumLimit)
.update();
boolean avatarUpdate = !guild.getAvatar().equals(avatar);
if (!avatarUpdate){
return;
}
uploadAvatarService.delReviewAvatar(RedisKey.guild_avatar_under_review.getKey(), guild.getOwnerUid().toString());
}
public Page<GuildAdminVo> pageGuild(int partitionId, Integer guildId, Long erbanNo,

8
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomSearchAdminService.java
View File

@@ -16,6 +16,7 @@ import com.accompany.business.model.RoomTag;
import com.accompany.business.model.room.RoomPlayType;
import com.accompany.business.mybatismapper.HallMapper;
import com.accompany.business.sensitvienew.SensitiveFilterUtil;
import com.accompany.business.service.UploadAvatarService;
import com.accompany.business.service.room.*;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.vo.RoomNotifyVo;
@@ -82,6 +83,8 @@ public class RoomSearchAdminService extends BaseService {
private RoomManageService roomManageService;
private Gson gson = new Gson();
@Autowired
private UploadAvatarService uploadAvatarService;
public PageInfo<Room> getAllRoomList(Integer pageNumber, Integer pageSize, String erbanNo, int sort, int roomPermitType, Integer partitionId) {
RoomExample roomExample = new RoomExample();
@@ -129,6 +132,7 @@ public class RoomSearchAdminService extends BaseService {
Boolean isPureMode, Boolean hasBlindDateRoomPri, Integer singleRoomSortId, Integer recommendStatus) throws Exception {
Room room = roomMapper.selectByPrimaryKey(Long.valueOf(uid));
if (room != null) {
boolean avatarUpdate = !room.getAvatar().equals(avatar);
RoomTag roomTag = roomTagAdminService.getRoomTagById(tagId);
if (roomTag != null) {
room.setRoomTag(roomTag.getName());
@@ -167,6 +171,10 @@ public class RoomSearchAdminService extends BaseService {
singleBroadcastSortService.saveSingRoomSortRecommend(room.getUid(), recommendStatus);
}
roomService.updateOpenRoom(room);
if (avatarUpdate){
uploadAvatarService.delReviewAvatar(RedisKey.room_avatar_under_review.getKey(), room.getUid().toString());
}
}
return room;
}

10
accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomAdminController.java
View File

@@ -11,8 +11,6 @@ import com.accompany.admin.vo.RoomVo;
import com.accompany.business.model.RoomTag;
import com.accompany.business.service.room.RobotUsingService;
import com.accompany.business.service.room.RoomService;
import com.accompany.business.service.user.UsersService;
import com.accompany.business.vo.message.MessageLayout;
import com.accompany.common.netease.util.NetEaseConstant;
import com.accompany.common.result.BusiResult;
import com.accompany.common.status.BusiStatus;
@@ -47,20 +45,12 @@ public class RoomAdminController extends BaseController {
@Autowired
private RoomAdminService roomAdminService;
@Autowired
private UsersService usersService;
@Autowired
private UsersBaseService usersBaseService;
@Autowired
private RobotUsingService robotUsingService;
@Autowired
private RoomService roomService;
public static final MessageLayout msgContent = new MessageLayout().
titleContent("资料审核通知").titleFontColor("#333333").titleFontSzie(30 / 2).titleFontBold(true)
.timeContent("%s").timeFontSize(24 / 2).timeFontColor("#999999")
.contentsNextContent("%s").contentsFontColor("#999999").contentsFontSize(28 / 2);
@GetMapping("/getAll")
public Pagination<RoomVo> getAllRoom(String erbanNo, int sort, int roomPermitType, Integer partitionId) {
PageInfo<Room> pageInfo = roomSearchAdminService.getAllRoomList(getPageNumber(), getPageSize(), erbanNo, sort, roomPermitType, partitionId);