From 83cb9521d4218384a069744dc489403ddda145ce Mon Sep 17 00:00:00 2001 From: zhangran Date: Mon, 1 Apr 2024 16:51:28 +0800 Subject: [PATCH] =?UTF-8?q?add-job=E6=9F=A5=E8=AF=A2=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E7=9A=84=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nanopart/server/job/BlackUserSyncJob.java | 22 ++++++++++++++++++- .../service/BlackAndWhiteListService.java | 2 ++ .../impl/BlackAndWhiteListServiceImpl.java | 6 +++++ 3 files changed, 29 insertions(+), 1 deletion(-) 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 3c24f180..2f4b4086 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 @@ -1,13 +1,17 @@ package cn.axzo.nanopart.server.job; import cn.axzo.nanopart.api.constant.enums.BlackModuleEnum; +import cn.axzo.nanopart.api.constant.enums.ListTypeEnum; import cn.axzo.nanopart.api.constant.enums.MQEventEnum; +import cn.axzo.nanopart.api.request.BlackListReq; 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.azxo.framework.common.utils.StringUtils; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.google.common.collect.Lists; +import com.google.common.collect.Maps; import com.xxl.job.core.biz.model.ReturnT; import com.xxl.job.core.handler.annotation.XxlJob; import lombok.extern.slf4j.Slf4j; @@ -15,6 +19,8 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -40,7 +46,21 @@ public class BlackUserSyncJob extends BaseJobHandler{ @Override @XxlJob("blackUserSyncJob") public ReturnT execute(String param) throws Exception { - List saasBlackWhiteLists = blackAndWhiteListService.listModuleBlackUser(); + List saasBlackWhiteLists; + // 身份证号不为空,多条以“,”分割 + if(StringUtils.isNotBlank(param)){ + List idCards = Arrays.stream(param.split(",")).collect(Collectors.toList()); + ArrayList models = Lists.newArrayList(BlackModuleEnum.GXJG_BLACKUSER_WORKER, BlackModuleEnum.GXJG_BLACKUSER_TEAMLEADER, BlackModuleEnum.GXJG_BLACKUSER_EMPLOYEE); + BlackListReq req = new BlackListReq(); + req.setModules(models); + req.setType(ListTypeEnum.BLACK_LIST); + HashMap map = Maps.newHashMap(); + map.put("userIdCard", idCards); + req.setParam(map); + saasBlackWhiteLists = blackAndWhiteListService.listModuleBlackUser(req); + }else{ + saasBlackWhiteLists = blackAndWhiteListService.listModuleBlackUser(); + } Map> modulBlackMap = saasBlackWhiteLists.stream().collect(Collectors.groupingBy(SaasBlackWhiteList::getModule)); modulBlackMap.forEach((module, blackList) -> { log.info("syncRockerMQ module:{} ,blackList.size:{}" ,module, blackList.size()); diff --git a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/BlackAndWhiteListService.java b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/BlackAndWhiteListService.java index 7e58670e..0378df96 100644 --- a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/BlackAndWhiteListService.java +++ b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/BlackAndWhiteListService.java @@ -53,4 +53,6 @@ public interface BlackAndWhiteListService { * @return */ List isInBlackListExistList(BlackListReq req); + + List listModuleBlackUser(BlackListReq req); } diff --git a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/impl/BlackAndWhiteListServiceImpl.java b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/impl/BlackAndWhiteListServiceImpl.java index 3596398e..3b5a0d95 100644 --- a/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/impl/BlackAndWhiteListServiceImpl.java +++ b/black-list/black-list-service/src/main/java/cn/axzo/nanopart/server/service/impl/BlackAndWhiteListServiceImpl.java @@ -397,4 +397,10 @@ public class BlackAndWhiteListServiceImpl implements BlackAndWhiteListService { List detail = blackAndWhiteListRepository.blackWhiteLists(req); return BeanMapper.copyList(detail, BlackAndWhiteListResp.class); } + + @Override + public List listModuleBlackUser(BlackListReq req){ + // 同步到RockerMQ + return blackAndWhiteListRepository.blackWhiteLists(req); + } } \ No newline at end of file