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

REQ-3045: 过滤掉找不到工人信息的分组

Browse Source
This commit is contained in:
yanglin 2024-10-24 11:49:47 +08:00
parent 0513a81959
commit 803d96bfc4
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,6 +15,7 @@ import cn.axzo.msg.center.service.pending.response.v3.model.PersonInfo;
import cn.axzo.msg.center.service.pending.response.v3.model.WorkerInfo;
import cn.axzo.trade.datasecurity.core.util.DataSecurityHelper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@ -34,6 +35,7 @@ import static java.util.stream.Collectors.toMap;
/**
* @author yanglin
*/
@Slf4j
@Component
@RequiredArgsConstructor
public class ModelV3ExtPopulator {
@ -99,7 +101,11 @@ public class ModelV3ExtPopulator {
: bankCardRes.stream().collect(groupingBy(WorkerBankCardRes::getPersonId));
for (ComponentWorkerGroup workerGroup : groups) {
WorkerProfileDto worker = workerIdentityId2WorkerProfile.get(workerGroup.getWorkerIdentityId());
if (worker == null) continue;
if (worker == null) {
log.warn("worker info not found, workerIdentityId: {}", workerGroup.getWorkerIdentityId());
workerGroup.removeFromModel();
continue;
}
PersonProfileDto person = worker.getPersonProfile();
WorkerInfo workerInfo = new WorkerInfo();
workerInfo.setName(person.getRealName());

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

@ -81,7 +81,7 @@ public class ModelV3Parser {
group.setName("工人信息");
Long personId = bizParam.getLong(CUSTOMER_PERSON_ID);
if (personId != null && personId > 0)
parsedModel.addComponentWorkerGroup(new ComponentWorkerGroup(group, personId));
parsedModel.addComponentWorkerGroup(new ComponentWorkerGroup(parsedModel, group, personId));
}
}

7
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/response/v3/model/ComponentWorkerGroup.java
View File

@ -10,6 +10,7 @@ import lombok.RequiredArgsConstructor;
@Getter
@RequiredArgsConstructor
public class ComponentWorkerGroup {
private final ParsedModelV3 modelV3;
private final ParsedGroupV3 group;
private final Long workerIdentityId;
@ -17,4 +18,10 @@ public class ComponentWorkerGroup {
public String toString() {
return JSON.toJSONString(this);
}
public void removeFromModel() {
if (modelV3.getGroups() == null) return;
modelV3.getGroups().removeIf(group -> this.group == group);
}
}