diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java index 7687136498..c3c8369784 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java @@ -1,5 +1,12 @@ package com.epmet.commons.rocketmq.constants; public interface TopicConstants { + /** + * 初始化客户 + */ String INIT_CUSTOMER = "init_customer"; + /** + * 小组成就 + */ + String RESI_GROUP = "group_achievement"; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/GroupAchievementMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/GroupAchievementMQMsg.java new file mode 100644 index 0000000000..148dd4cc6e --- /dev/null +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/GroupAchievementMQMsg.java @@ -0,0 +1,25 @@ +package com.epmet.commons.rocketmq.messages; + +import lombok.Data; + +import java.io.Serializable; + +/** + * desc:小组成就mq消息类 + * + * @author LiuJanJun + * @date 2021/4/22 8:35 下午 + */ +@Data +public class GroupAchievementMQMsg implements Serializable { + + private String customerId; + + private String groupId; + + /** + * 成就类型 + * @see com.epmet.modules.enums.AchievementTypeEnum + */ + private String achievementType; +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/AbstractStatsAchievementService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/AbstractStatsAchievementService.java index 9ecd4ad915..93980df9cb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/AbstractStatsAchievementService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/AbstractStatsAchievementService.java @@ -16,11 +16,9 @@ */ package com.epmet.modules.group.service; - import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; -import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.modules.enums.AchievementTypeEnum; import com.epmet.modules.group.dao.ResiGroupDao; import com.epmet.modules.group.entity.ResiGroupAchievementConfigEntity; @@ -88,8 +86,12 @@ public abstract class AbstractStatsAchievementService { Integer nextTargetValue = null; for (int i = 0; i < 5; i++) { nextTargetValue = GroupAchievementUtils.getNextTargetValue(achievementType,lastOne.getTargetValue()); - ResiGroupAchievementConfigEntity next = ConvertUtils.sourceToTarget(lastOne, ResiGroupAchievementConfigEntity.class); + ResiGroupAchievementConfigEntity next = new ResiGroupAchievementConfigEntity(); + next.setCustomerId(lastOne.getCustomerId()); + next.setAchievementName(lastOne.getAchievementName().replace(String.valueOf(lastOne.getTargetValue()), String.valueOf(nextTargetValue))); + next.setPreValue(lastOne.getTargetValue()); next.setTargetValue(nextTargetValue); + next.setAchievementType(lastOne.getAchievementType()); newConfigList.add(next); } achievementConfigService.insertBatch(newConfigList); diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java index 466ff735c3..d29b5217d8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/StatsAchievementServiceImpl.java @@ -92,7 +92,7 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService .eq(ResiTopicEntity::getGroupId,groupId) .eq(ResiTopicEntity::getShiftIssue, NumConstant.ONE) .eq(ResiTopicEntity::getDelFlag,NumConstant.ZERO); - currentValue = 10;//resiTopicDao.selectCount(queryWrapper); + currentValue = 210;//resiTopicDao.selectCount(queryWrapper); break; case RESOVLE_TOPIC: //查询已经关闭且为已解决的话题数 @@ -214,8 +214,8 @@ public class StatsAchievementServiceImpl extends AbstractStatsAchievementService private List getConfigByType(String achievementType,int pageNum,int pageSize) { List list = super.getAchievemnetConfigPage(pageNum, pageSize, achievementType); if (CollectionUtils.isEmpty(list)) { - log.warn("获取小组成就配置错误,{} 开始进行初始化规则", AchievementTypeEnum.MEMBER.getCode()); - list = super.initAchievementConfig(AchievementTypeEnum.MEMBER.getCode()); + log.warn("获取小组成就配置错误,{} 开始进行初始化规则", achievementType); + list = super.initAchievementConfig(achievementType); } return list; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/AbstractRocketConsumer.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/AbstractRocketConsumer.java new file mode 100644 index 0000000000..c06e2ca81f --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/mq/AbstractRocketConsumer.java @@ -0,0 +1,23 @@ +package com.epmet.mq; + +import lombok.extern.slf4j.Slf4j; +import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; +import org.apache.rocketmq.spring.core.RocketMQListener; + +/** + * desc: + * + * @author: LiuJanJun + * @date: 2021/4/22 10:10 下午 + * @version: 1.0 + */ +@Slf4j +//@RocketMQMessageListener(topic = "${game.server.config.business-game-message-topic}", consumerGroup = "gateway-message-consumer-group") +@RocketMQMessageListener(topic = "group_achievement", consumerGroup = "group") +public class AbstractRocketConsumer implements RocketMQListener { + + @Override + public void onMessage(String s) { + log.info("receive msg:{}",s); + } +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml index c0a7f717a2..1728c69e11 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupAchievementConfigDao.xml @@ -24,7 +24,7 @@ WHERE ACHIEVEMENT_TYPE = #{achievementType} AND DEL_FLAG = '0' - order by TARGET_VALUE + order by TARGET_VALUE DESC LIMIT 1