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

REQ-3046: 显示在卡片上的按钮

Browse Source
This commit is contained in:
yanglin 2024-10-22 11:53:00 +08:00
parent a8f09a3a10
commit 0ad0ec336c
2 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,15 +42,15 @@ public class ModelV3ExtPopulator {
private final BankCardApi bankCardApi;
public void populate(ParsedModelV3... models) {
//ArrayList<ParsedKV> personKeyValues = new ArrayList<>();
//List<ComponentWorkerGroup> componentWorkerGroups = new ArrayList<>();
//for (ParsedModelV3 model : models) {
// if (model == null) continue;
// personKeyValues.addAll(model.getPersonKeyValues());
// componentWorkerGroups.addAll(model.getComponentWorkerGroups());
//}
//populatePersonKV(personKeyValues);
//populateComponentWorkGroup(componentWorkerGroups);
ArrayList<ParsedKV> personKeyValues = new ArrayList<>();
List<ComponentWorkerGroup> componentWorkerGroups = new ArrayList<>();
for (ParsedModelV3 model : models) {
if (model == null) continue;
personKeyValues.addAll(model.getPersonKeyValues());
componentWorkerGroups.addAll(model.getComponentWorkerGroups());
}
populatePersonKV(personKeyValues);
populateComponentWorkGroup(componentWorkerGroups);
}
public void populatePersonKV(ParsedKV keyValue) {
@ -105,7 +105,7 @@ public class ModelV3ExtPopulator {
workerInfo.setName(person.getRealName());
workerInfo.setIcon(person.getAvatarUrl());
workerInfo.setPhone(person.getPhone());
workerInfo.setPhoneCiphertext(person.getPhone());
workerInfo.setPhoneCiphertext(DataSecurityHelper.encrypt(person.getPhone()));
workerInfo.setBirthday(person.getBirthday());
workerInfo.setNationality(person.getNationality());
workerInfo.setIdNumber(person.getIdNumber());

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

@ -63,20 +63,8 @@ public class ModelV3Parser {
JSONObject routerParam) {
return parseModel(templateModel, entity, bizParam, routerParam, routerParam, null);
}
public ParsedModelV3 parseModel(TemplateModelV3 templateModel,
MessageEntity entity,
JSONObject bizParam,
JSONObject routerParam,
JSONObject appendRouterParam,
@Nullable TerminalProvider terminalProvider) {
ParsedModelV3 parsedModel = new ParsedModelV3();
parsedModel.setTemplate(BeanMapper.copyBean(templateModel.getTemplate(), ParsedTemplateV3.class));
parsedModel.setGroups(copyGroups(templateModel.getGroups()));
parsedModel.setButtons(BeanMapper.copyList(templateModel.getButtons(), ParsedButtonV3.class));
return parsedModel;
}
public ParsedModelV3 parseModel0(TemplateModelV3 templateModel,
public ParsedModelV3 parseModel(TemplateModelV3 templateModel,
MessageEntity entity,
JSONObject bizParam,
JSONObject routerParam,