hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增 发送荣誉的时候 发送徽章

Browse Source
This commit is contained in:
tianfeng 2026-05-28 18:33:28 +08:00
parent c10b7dc378
commit 78b17b991a
3 changed files with 151 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/listener/BadgeOperateListener.java
View File

@ -22,6 +22,7 @@ import com.red.circle.other.infra.database.rds.service.badge.BadgeBackpackServic
import com.red.circle.other.infra.database.rds.service.badge.BadgeConfigService; import com.red.circle.other.infra.database.rds.service.badge.BadgeConfigService;
import com.red.circle.other.inner.endpoint.material.props.PropsBackpackClient; import com.red.circle.other.inner.endpoint.material.props.PropsBackpackClient;
import com.red.circle.other.inner.enums.material.BadgeBackpackExpireTypeEnum; import com.red.circle.other.inner.enums.material.BadgeBackpackExpireTypeEnum;
import com.red.circle.other.inner.enums.material.BadgeConfigTypeEnum;
import com.red.circle.other.inner.enums.material.BadgeKeyEnum; import com.red.circle.other.inner.enums.material.BadgeKeyEnum;
import com.red.circle.other.inner.enums.material.ConsolePropsTypeEnum; import com.red.circle.other.inner.enums.material.ConsolePropsTypeEnum;
import com.red.circle.other.inner.model.cmd.material.GivePropsBackpackCmd; import com.red.circle.other.inner.model.cmd.material.GivePropsBackpackCmd;
@ -56,6 +57,17 @@ public class BadgeOperateListener implements MessageListener {
.put(BadgeKeyEnum.RECHARGE_AGENCY.name(), 2054123011514957825L) .put(BadgeKeyEnum.RECHARGE_AGENCY.name(), 2054123011514957825L)
.build(); .build();
/** ADMINISTRATOR 类型的 badgeKey 集合. */
private static final Set<String> ADMINISTRATOR_BADGE_KEYS = Sets.newHashSet(
BadgeKeyEnum.BD.name(),
BadgeKeyEnum.HOST.name(),
BadgeKeyEnum.SUPER_ADMIN.name(),
BadgeKeyEnum.AGENCY.name(),
BadgeKeyEnum.ADMIN.name(),
BadgeKeyEnum.MANAGER.name(),
BadgeKeyEnum.RECHARGE_AGENCY.name()
);
private final BadgeConfigService badgeConfigService; private final BadgeConfigService badgeConfigService;
private final BadgeBackpackService badgeBackpackService; private final BadgeBackpackService badgeBackpackService;
private final MessageEventProcess messageEventProcess; private final MessageEventProcess messageEventProcess;
@ -91,8 +103,13 @@ public class BadgeOperateListener implements MessageListener {
return; return;
} }
Long finalBadgeId = badgeId; // badgeKey 属于 ADMINISTRATOR_BADGE_KEYS，同时操作 ADMINISTRATOR 和 HONOR_ADMIN 两个徽章
if (badgeId == null && badgeKey != null && ADMINISTRATOR_BADGE_KEYS.contains(badgeKey)) {
handleDualTypeBadgeOperate(userId, badgeKey, operationType, event.getDays());
return;
}
Long finalBadgeId = badgeId;
if (finalBadgeId == null) { if (finalBadgeId == null) {
if (badgeKey == null) { if (badgeKey == null) {
log.warn("徽章操作事件缺少badgeKey和badgeId, userId: {}", userId); log.warn("徽章操作事件缺少badgeKey和badgeId, userId: {}", userId);
@ -115,10 +132,36 @@ public class BadgeOperateListener implements MessageListener {
} }
} }
/**
* ADMINISTRATOR_BADGE_KEYS 类型的 badgeKey 同时操作 ADMINISTRATOR 和 HONOR_ADMIN 两个徽章.
*/
private void handleDualTypeBadgeOperate(Long userId, String badgeKey, String operationType, Long days) {
List<String> types = List.of(BadgeConfigTypeEnum.ADMINISTRATOR.name(), BadgeConfigTypeEnum.HONOR_ADMIN.name());
for (String type : types) {
BadgeConfig badgeConfig = badgeConfigService.getByTypeAndBadgeKey(type, badgeKey);
if (badgeConfig == null) {
log.warn("徽章配置不存在, type: {}, badgeKey: {}", type, badgeKey);
continue;
}
if (BadgeOperateEvent.OperationType.WEAR.name().equals(operationType)) {
handleWearBadge(userId, badgeConfig.getId(), badgeKey, days, false);
} else if (BadgeOperateEvent.OperationType.REMOVE.name().equals(operationType)) {
handleRemoveBadge(userId, badgeConfig.getId(), badgeKey, false);
}
}
// 头像框只操作一次
int avatarFrameDays = BadgeOperateEvent.OperationType.WEAR.name().equals(operationType) ? 999 : -999;
giveAvatarFrameIfMapped(badgeKey, userId, avatarFrameDays);
}
/** /**
* 佩戴徽章. * 佩戴徽章.
*/ */
private void handleWearBadge(Long userId, Long badgeId, String badgeKey, Long days) { private void handleWearBadge(Long userId, Long badgeId, String badgeKey, Long days) {
handleWearBadge(userId, badgeId, badgeKey, days, true);
}
private void handleWearBadge(Long userId, Long badgeId, String badgeKey, Long days, boolean giveAvatarFrame) {
String lockKey = "badge:operate:wear:" + userId + ":" + badgeId; String lockKey = "badge:operate:wear:" + userId + ":" + badgeId;
distributedLockUtil.executeWithLock(lockKey, () -> { distributedLockUtil.executeWithLock(lockKey, () -> {
@ -143,7 +186,9 @@ public class BadgeOperateListener implements MessageListener {
} }
refreshUserWearBadges(userId); refreshUserWearBadges(userId);
giveAvatarFrameIfMapped(badgeKey, userId, 999); if (giveAvatarFrame) {
giveAvatarFrameIfMapped(badgeKey, userId, 999);
}
return null; return null;
}); });
@ -165,12 +210,18 @@ public class BadgeOperateListener implements MessageListener {
* 移除徽章. * 移除徽章.
*/ */
private void handleRemoveBadge(Long userId, Long badgeId, String badgeKey) { private void handleRemoveBadge(Long userId, Long badgeId, String badgeKey) {
handleRemoveBadge(userId, badgeId, badgeKey, true);
}
private void handleRemoveBadge(Long userId, Long badgeId, String badgeKey, boolean giveAvatarFrame) {
String lockKey = "badge:operate:remove:" + userId + ":" + badgeId; String lockKey = "badge:operate:remove:" + userId + ":" + badgeId;
distributedLockUtil.executeWithLock(lockKey, () -> { distributedLockUtil.executeWithLock(lockKey, () -> {
badgeBackpackService.deleteBadges(userId, Sets.newHashSet(badgeId)); badgeBackpackService.deleteBadges(userId, Sets.newHashSet(badgeId));
refreshUserWearBadges(userId); refreshUserWearBadges(userId);
giveAvatarFrameIfMapped(badgeKey, userId, -999); if (giveAvatarFrame) {
giveAvatarFrameIfMapped(badgeKey, userId, -999);
}
return null; return null;
}); });
} }

9
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/badge/BadgeConfigService.java
View File

@ -126,4 +126,13 @@ public interface BadgeConfigService extends BaseService<BadgeConfig> {
* @return 徽章配置 * @return 徽章配置
*/ */
BadgeConfig getByBadgeKey(String badgeKey); BadgeConfig getByBadgeKey(String badgeKey);
/**
* 根据类型和徽章Key查询徽章配置.
*
* @param type 徽章类型
* @param badgeKey 徽章Key
* @return 徽章配置
*/
BadgeConfig getByTypeAndBadgeKey(String type, String badgeKey);
} }

166
rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/rds/service/badge/impl/BadgeConfigServiceImpl.java
View File

@ -35,10 +35,10 @@ public class BadgeConfigServiceImpl extends BaseServiceImpl<BadgeConfigDAO, Badg
@Override @Override
public List<BadgeConfig> listBadgeByType(SysBadgeConfigTypeEnum type) { public List<BadgeConfig> listBadgeByType(SysBadgeConfigTypeEnum type) {
List<BadgeConfig> badgeConfigs = query() List<BadgeConfig> badgeConfigs = query()
.eq(BadgeConfig::getType, type) .eq(BadgeConfig::getType, type)
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.orderByDesc(BadgeConfig::getId) .orderByDesc(BadgeConfig::getId)
.list(); .list();
if (CollectionUtils.isEmpty(badgeConfigs)) { if (CollectionUtils.isEmpty(badgeConfigs)) {
return Lists.newArrayList(); return Lists.newArrayList();
@ -50,53 +50,53 @@ public class BadgeConfigServiceImpl extends BaseServiceImpl<BadgeConfigDAO, Badg
@Override @Override
public Long getFreightBadgeId() { public Long getFreightBadgeId() {
return Optional.ofNullable( return Optional.ofNullable(
query().select(BadgeConfig::getId) query().select(BadgeConfig::getId)
.eq(BadgeConfig::getType, BadgeConfigTypeEnum.HONOR_ADMIN) .eq(BadgeConfig::getType, BadgeConfigTypeEnum.HONOR_ADMIN)
.eq(BadgeConfig::getBadgeKey, BadgeKeyEnum.RECHARGE_AGENCY) .eq(BadgeConfig::getBadgeKey, BadgeKeyEnum.RECHARGE_AGENCY)
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.last(PageConstant.LIMIT_ONE) .last(PageConstant.LIMIT_ONE)
.getOne()) .getOne())
.map(BadgeConfig::getId) .map(BadgeConfig::getId)
.orElse(null); .orElse(null);
} }
@Override @Override
public List<Long> listAdministratorIds() { public List<Long> listAdministratorIds() {
return Optional.ofNullable(query().select(BadgeConfig::getId) return Optional.ofNullable(query().select(BadgeConfig::getId)
.eq(BadgeConfig::getType, BadgeConfigTypeEnum.ADMINISTRATOR) .eq(BadgeConfig::getType, BadgeConfigTypeEnum.ADMINISTRATOR)
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.list()) .list())
.map(badgeConfigs -> badgeConfigs.stream().map(BadgeConfig::getId).collect( .map(badgeConfigs -> badgeConfigs.stream().map(BadgeConfig::getId).collect(
Collectors.toList())) Collectors.toList()))
.orElse(null); .orElse(null);
} }
@Override @Override
public List<Long> listAdminBadgeIds() { public List<Long> listAdminBadgeIds() {
return Optional.ofNullable( return Optional.ofNullable(
query().select(BadgeConfig::getId) query().select(BadgeConfig::getId)
.eq(BadgeConfig::getType, SysBadgeConfigTypeEnum.HONOR_ADMIN) .eq(BadgeConfig::getType, SysBadgeConfigTypeEnum.HONOR_ADMIN)
.likeLeft(BadgeConfig::getBadgeKey, BadgeKeyEnum.ADMIN) .likeLeft(BadgeConfig::getBadgeKey, BadgeKeyEnum.ADMIN)
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.list()) .list())
.map(sysBadgeConfigs -> sysBadgeConfigs.stream().map(BadgeConfig::getId).collect( .map(sysBadgeConfigs -> sysBadgeConfigs.stream().map(BadgeConfig::getId).collect(
Collectors.toList())) Collectors.toList()))
.orElse(null); .orElse(null);
} }
@Override @Override
public List<BadgeConfig> listByBadgeKey(BadgeKeyEnum badgeKey) { public List<BadgeConfig> listByBadgeKey(BadgeKeyEnum badgeKey) {
return query().eq(BadgeConfig::getBadgeKey, badgeKey) return query().eq(BadgeConfig::getBadgeKey, badgeKey)
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.orderByAsc(BadgeConfig::getBadgeLevel) .orderByAsc(BadgeConfig::getBadgeLevel)
.list(); .list();
} }
@Override @Override
public List<BadgeConfig> listBadgeConfig(BadgeConfigTypeEnum type) { public List<BadgeConfig> listBadgeConfig(BadgeConfigTypeEnum type) {
if (type == BadgeConfigTypeEnum.ALL) { if (type == BadgeConfigTypeEnum.ALL) {
return query() return query()
.in(BadgeConfig::getType, Arrays.asList(BadgeConfigTypeEnum.ACTIVITY, BadgeConfigTypeEnum.ACHIEVEMENT, BadgeConfigTypeEnum.ADMINISTRATOR)) .in(BadgeConfig::getType, Arrays.asList(BadgeConfigTypeEnum.ACTIVITY, BadgeConfigTypeEnum.ACHIEVEMENT, BadgeConfigTypeEnum.ADMINISTRATOR))
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.orderByAsc(BadgeConfig::getBadgeLevel) .orderByAsc(BadgeConfig::getBadgeLevel)
.last(PageConstant.formatLimit(300)) .last(PageConstant.formatLimit(300))
@ -104,89 +104,89 @@ public class BadgeConfigServiceImpl extends BaseServiceImpl<BadgeConfigDAO, Badg
} }
return query().eq(BadgeConfig::getType, type) return query().eq(BadgeConfig::getType, type)
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.orderByAsc(BadgeConfig::getBadgeLevel) .orderByAsc(BadgeConfig::getBadgeLevel)
.last(PageConstant.formatLimit(200)).list(); .last(PageConstant.formatLimit(200)).list();
} }
@Override @Override
public List<BadgeConfig> listByIds(List<Long> ids) { public List<BadgeConfig> listByIds(List<Long> ids) {
return CollectionUtils.isEmpty(ids) ? CollectionUtils.newArrayList() return CollectionUtils.isEmpty(ids) ? CollectionUtils.newArrayList()
: query().in(BadgeConfig::getId, ids).list(); : query().in(BadgeConfig::getId, ids).list();
} }
@Override @Override
public Map<Long, BadgeConfig> mapByIds(Set<Long> ids) { public Map<Long, BadgeConfig> mapByIds(Set<Long> ids) {
return CollectionUtils.isEmpty(ids) return CollectionUtils.isEmpty(ids)
? CollectionUtils.newHashMap() ? CollectionUtils.newHashMap()
: Optional.ofNullable(query().in(BadgeConfig::getId, ids).list2Map(BadgeConfig::getId)) : Optional.ofNullable(query().in(BadgeConfig::getId, ids).list2Map(BadgeConfig::getId))
.orElseGet(CollectionUtils::newHashMap); .orElseGet(CollectionUtils::newHashMap);
} }
@Override @Override
public PageResult<BadgeConfig> getGiveBadgePage(GiveBadgeConfigQryCmd query, Set<Long> collect) { public PageResult<BadgeConfig> getGiveBadgePage(GiveBadgeConfigQryCmd query, Set<Long> collect) {
return query() return query()
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.in(BadgeConfig::getId, collect) .in(BadgeConfig::getId, collect)
.ne(BadgeConfig::getType, SysBadgeConfigTypeEnum.ACHIEVEMENT.getName()) .ne(BadgeConfig::getType, SysBadgeConfigTypeEnum.ACHIEVEMENT.getName())
.ne(BadgeConfig::getType, SysBadgeConfigTypeEnum.FAMILY.getName()) .ne(BadgeConfig::getType, SysBadgeConfigTypeEnum.FAMILY.getName())
.ne(BadgeConfig::getType, SysBadgeConfigTypeEnum.ROOM_ACHIEVEMENT.getName()) .ne(BadgeConfig::getType, SysBadgeConfigTypeEnum.ROOM_ACHIEVEMENT.getName())
.orderByDesc(BadgeConfig::getCreateTime).page(query.getPageQuery()); .orderByDesc(BadgeConfig::getCreateTime).page(query.getPageQuery());
} }
@Override @Override
public List<BadgeConfig> listBadgeByIds(SysBadgeConfigTypeEnum type, Set<Long> collect) { public List<BadgeConfig> listBadgeByIds(SysBadgeConfigTypeEnum type, Set<Long> collect) {
return query().eq(BadgeConfig::getType, type) return query().eq(BadgeConfig::getType, type)
.in(BadgeConfig::getId, collect) .in(BadgeConfig::getId, collect)
.list(); .list();
} }
@Override @Override
public void deleteBadge(Long id) { public void deleteBadge(Long id) {
update() update()
.set(BadgeConfig::getDel, Boolean.TRUE) .set(BadgeConfig::getDel, Boolean.TRUE)
.eq(BadgeConfig::getId, id) .eq(BadgeConfig::getId, id)
.execute(); .execute();
} }
@Override @Override
public void updateBadgeConfig(BadgeConfig badgeConfig) { public void updateBadgeConfig(BadgeConfig badgeConfig) {
update() update()
.set(BadgeConfig::getBadgeName, badgeConfig.getBadgeName()) .set(BadgeConfig::getBadgeName, badgeConfig.getBadgeName())
.set(BadgeConfig::getType, badgeConfig.getType()) .set(BadgeConfig::getType, badgeConfig.getType())
.set(BadgeConfig::getBadgeKey, badgeConfig.getBadgeKey()) .set(BadgeConfig::getBadgeKey, badgeConfig.getBadgeKey())
.set(BadgeConfig::getBadgeLevel, badgeConfig.getBadgeLevel()) .set(BadgeConfig::getBadgeLevel, badgeConfig.getBadgeLevel())
.set(BadgeConfig::getMilestone, badgeConfig.getMilestone()) .set(BadgeConfig::getMilestone, badgeConfig.getMilestone())
.eq(BadgeConfig::getId, badgeConfig.getId()) .eq(BadgeConfig::getId, badgeConfig.getId())
.last(PageConstant.LIMIT_ONE) .last(PageConstant.LIMIT_ONE)
.execute(); .execute();
} }
@Override @Override
public PageResult<BadgeConfig> getBadgeConfig(SysBadgeConfigQryCmd query) { public PageResult<BadgeConfig> getBadgeConfig(SysBadgeConfigQryCmd query) {
return query() return query()
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.like(StringUtils.isNotBlank(query.getBadgeName()), BadgeConfig::getBadgeName, .like(StringUtils.isNotBlank(query.getBadgeName()), BadgeConfig::getBadgeName,
query.getBadgeName()) query.getBadgeName())
.like(StringUtils.isNotBlank(query.getBadgeKey()), BadgeConfig::getBadgeKey, .like(StringUtils.isNotBlank(query.getBadgeKey()), BadgeConfig::getBadgeKey,
query.getBadgeKey()) query.getBadgeKey())
.eq(Objects.nonNull(query.getId()), BadgeConfig::getId, query.getId()) .eq(Objects.nonNull(query.getId()), BadgeConfig::getId, query.getId())
.eq(StringUtils.isNotBlank(query.getType()), BadgeConfig::getType, query.getType()) .eq(StringUtils.isNotBlank(query.getType()), BadgeConfig::getType, query.getType())
.orderByDesc(BadgeConfig::getCreateTime) .orderByDesc(BadgeConfig::getCreateTime)
.page(query.getPageQuery()); .page(query.getPageQuery());
} }
@Override @Override
public Long getAdminBadgeId(String key) { public Long getAdminBadgeId(String key) {
return Optional.ofNullable( return Optional.ofNullable(
query().select(BadgeConfig::getId) query().select(BadgeConfig::getId)
.eq(BadgeConfig::getType, SysBadgeConfigTypeEnum.HONOR_ADMIN) .eq(BadgeConfig::getType, SysBadgeConfigTypeEnum.HONOR_ADMIN)
.eq(BadgeConfig::getBadgeKey, key) .eq(BadgeConfig::getBadgeKey, key)
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.last(PageConstant.LIMIT_ONE) .last(PageConstant.LIMIT_ONE)
.getOne()) .getOne())
.map(BadgeConfig::getId) .map(BadgeConfig::getId)
.orElse(null); .orElse(null);
} }
@Override @Override
@ -196,15 +196,25 @@ public class BadgeConfigServiceImpl extends BaseServiceImpl<BadgeConfigDAO, Badg
@Override @Override
public List<BadgeConfig> getBadgeConfigList(BadgeConfigTypeEnum type, String sysOrgin) { public List<BadgeConfig> getBadgeConfigList(BadgeConfigTypeEnum type, String sysOrgin) {
return baseDAO.getBadgeConfigList(type,sysOrgin); return baseDAO.getBadgeConfigList(type, sysOrgin);
} }
@Override @Override
public BadgeConfig getByBadgeKey(String badgeKey) { public BadgeConfig getByBadgeKey(String badgeKey) {
return query() return query()
.eq(BadgeConfig::getBadgeKey, badgeKey) .eq(BadgeConfig::getBadgeKey, badgeKey)
.eq(BadgeConfig::getDel, Boolean.FALSE) .eq(BadgeConfig::getDel, Boolean.FALSE)
.last(PageConstant.LIMIT_ONE) .last(PageConstant.LIMIT_ONE)
.getOne(); .getOne();
}
@Override
public BadgeConfig getByTypeAndBadgeKey(String type, String badgeKey) {
return query()
.eq(BadgeConfig::getType, type)
.eq(BadgeConfig::getBadgeKey, badgeKey)
.eq(BadgeConfig::getDel, Boolean.FALSE)
.last(PageConstant.LIMIT_ONE)
.getOne();
} }
} }