wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3832

Browse Source
This commit is contained in:
zhongpeng 2025-03-12 18:17:16 +08:00
parent 80d1606fa4
commit 7ca781e227
5 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/pom.xml
View File

@ -173,7 +173,7 @@
</dependency>
<dependency>
<groupId>cn.axzo.meepo</groupId>
<artifactId>meepo-api</artifactId>
<artifactId>meepo-api-definition</artifactId>
</dependency>
<dependency>
<groupId>cn.axzo.basics</groupId>

14
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/v3/V3ExtPopulator.java
View File

@ -6,8 +6,8 @@ import cn.axzo.basics.profiles.dto.basic.BasicDto;
import cn.axzo.basics.profiles.dto.basic.PersonProfileDto;
import cn.axzo.basics.profiles.dto.basic.ProfessionTagDto;
import cn.axzo.basics.profiles.dto.basic.WorkerProfileDto;
import cn.axzo.meepo.api.BankCardApi;
import cn.axzo.meepo.api.dto.response.WorkerBankCardRes;
import cn.axzo.meepo.api.definition.bankcard.query.BankCardApi;
import cn.axzo.meepo.api.definition.bankcard.query.dto.response.WorkerBankCardApiRes;
import cn.axzo.msg.center.common.utils.BizAssertions;
import cn.axzo.msg.center.service.enums.KVContentType;
import cn.axzo.msg.center.service.pending.response.v3.model.ComponentWorkerGroup;
@ -106,12 +106,12 @@ public class V3ExtPopulator {
.map(BasicDto::getId)
.distinct()
.collect(toList());
List<WorkerBankCardRes> bankCardRes = null;
List<WorkerBankCardApiRes> bankCardRes = null;
if (CollectionUtils.isNotEmpty(personIds))
bankCardRes = BizAssertions.assertResponse(bankCardApi.batchGetBankByAxzoUserId(personIds));
Map<Long, List<WorkerBankCardRes>> personId2BankCard = bankCardRes == null
bankCardRes = BizAssertions.assertResponse(bankCardApi.batchGetBankCardByPersonId(personIds));
Map<Long, List<WorkerBankCardApiRes>> personId2BankCard = bankCardRes == null
? Collections.emptyMap()
: bankCardRes.stream().collect(groupingBy(WorkerBankCardRes::getPersonId));
: bankCardRes.stream().collect(groupingBy(WorkerBankCardApiRes::getPersonId));
for (ComponentWorkerGroup workerGroup : groups) {
WorkerProfileDto worker = workerIdentityId2WorkerProfile.get(workerGroup.getWorkerIdentityId());
if (worker == null) {
@ -130,7 +130,7 @@ public class V3ExtPopulator {
workerInfo.setIdNumber(person.getIdNumber());
workerInfo.setIdNumberCiphertext(DataSecurityHelper.encrypt(person.getIdNumber()));
workerInfo.setIdentityValid(isWorkerIdentityValid(worker));
List<WorkerBankCardRes> bankCards = personId2BankCard.get(worker.getPersonProfile().getId());
List<WorkerBankCardApiRes> bankCards = personId2BankCard.get(worker.getPersonProfile().getId());
workerInfo.setCardValid(CollectionUtils.isNotEmpty(bankCards)
&& StringUtils.isNotBlank(bankCards.get(0).getBankCardNo()));
workerInfo.setProfessionNames(worker.getProfessionTags().stream()

6
pom.xml
View File

@ -112,6 +112,12 @@
<artifactId>workflow-engine-spring-boot-starter</artifactId>
<version>${workflow.version}</version>
</dependency>
<dependency>
<groupId>cn.axzo.meepo</groupId>
<artifactId>meepo-api-definition</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
</dependencyManagement>

6
start/pom.xml
View File

@ -82,6 +82,12 @@
<groupId>io.github.openfeign</groupId>
<artifactId>feign-httpclient</artifactId>
</dependency>
<dependency>
<groupId>cn.axzo.meepo</groupId>
<artifactId>meepo-api-definition</artifactId>
</dependency>
</dependencies>
<build>

2
start/src/main/java/cn/axzo/msg/center/MsgCenterApplication.java
View File

@ -26,7 +26,7 @@ import org.springframework.core.env.Environment;
"cn.axzo.basics.profiles.api",
"cn.axzo.apollo.api",
"cn.axzo.msg.center.inside.notices.service.impl",
"cn.axzo.meepo.api",
"cn.axzo.meepo.api.definition.bankcard.query",
"cn.axzo.riven.client.feign",
"cn.axzo.epic.client.feign",
"cn.axzo.orggateway.api.orgteamourelation"