diff --git a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/job/BlackUserSyncJob.java b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/job/BlackUserSyncJob.java index 4255d327..3c24f180 100644 --- a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/job/BlackUserSyncJob.java +++ b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/job/BlackUserSyncJob.java @@ -5,12 +5,16 @@ import cn.axzo.nanopart.api.constant.enums.MQEventEnum; import cn.axzo.nanopart.server.dao.entity.SaasBlackWhiteList; import cn.axzo.nanopart.server.mq.producer.BlackProducer; import cn.axzo.nanopart.server.service.BlackAndWhiteListService; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; +import com.google.common.collect.Lists; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Objects; @@ -40,10 +44,15 @@ public class BlackUserSyncJob extends BaseJobHandler{ Map> modulBlackMap = saasBlackWhiteLists.stream().collect(Collectors.groupingBy(SaasBlackWhiteList::getModule)); modulBlackMap.forEach((module, blackList) -> { log.info("syncRockerMQ module:{} ,blackList.size:{}" ,module, blackList.size()); + BlackModuleEnum blackModuleEnum = BlackModuleEnum.getByValue(module); MQEventEnum event = MQEventEnum.getByName(blackModuleEnum.name()); + + ArrayList> sends = Lists.newArrayList(); + blackList.forEach(item -> sends.add(item.getParam())); + String jsonStr = JSONUtil.toJsonStr(sends); if(Objects.nonNull(blackModuleEnum) && Objects.nonNull(event)){ - BlackProducer.sendBatch(event, blackList); + BlackProducer.send(event, jsonStr); } }); return ReturnT.SUCCESS; diff --git a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/mq/producer/BlackProducer.java b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/mq/producer/BlackProducer.java index 3109bc93..1e0fbb2d 100644 --- a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/mq/producer/BlackProducer.java +++ b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/mq/producer/BlackProducer.java @@ -51,6 +51,18 @@ public class BlackProducer implements InitializingBean { baseEntities.forEach(baseEntity -> send(mqEventEnum, baseEntity, null)); } + public static void send(MQEventEnum mqEventEnum, String data) { + //生产消息 + eventProducer.send(Event.builder() + .targetType(mqEventEnum.getModel()) + .eventCode(mqEventEnum.getEventCode()) + .eventModule(mqEventEnum.getModel()) + .eventName(mqEventEnum.getTag()) + .operatorId(null) + .data(data) + .build()); + } + @Override public void afterPropertiesSet() { eventProducer = SpringUtil.getBean(EventProducer.class);