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

send message add personAppVersionCode

Browse Source
This commit is contained in:
金海洋 2023-08-14 09:17:52 +08:00
parent 770d0c7a87
commit 45f71b9bbd
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
View File

@ -148,8 +148,7 @@ public class MessageRecordServiceImpl implements MessageRecordService {
@Async
public void asyncPushAthena(GeneralMessageReq message, String audioFileName, String moduleName,
List<MessageRecord> pushMessages) {
sendMessage(message.getRelationId(), audioFileName,
moduleName, pushMessages, message.getRouterParams(), message.getVersionCode());
sendMessage(message, audioFileName, moduleName, pushMessages);
}
@ -210,8 +209,12 @@ public class MessageRecordServiceImpl implements MessageRecordService {
* @param pushMessages 推送消息
* @param audioFileName 语音文件
*/
private void sendMessage(Long relationId, String audioFileName, String moduleName,
List<MessageRecord> pushMessages, Map<String, String> routerParams, Integer versionCode) {
private void sendMessage(GeneralMessageReq message, String audioFileName, String moduleName,
List<MessageRecord> pushMessages) {
Long relationId = message.getRelationId();
Map<String, String> routerParams = message.getRouterParams();
Map<Long,Integer> personAppVersionCode = message.getPersonAppVersionCode();
ArrayList<MsgRouteTypeEnum> msgRouteTypeEnums = Lists.newArrayList(MsgRouteTypeEnum.ANDROID,
MsgRouteTypeEnum.IOS, MsgRouteTypeEnum.MINI_PROGRAM, MsgRouteTypeEnum.WEBVIEW);
@ -224,6 +227,8 @@ public class MessageRecordServiceImpl implements MessageRecordService {
imMessage.setNickName(moduleName);
pushMessages.forEach(item -> {
String toId = buildToId(item.getToId(), item.getPersonId(), item.getReceiveType(), item.getBizId());
Integer versionCode = personAppVersionCode.getOrDefault(item.getPersonId(), 0);
log.info("发给用户：{}, versionCode:{}, personId: {}",item.getToId(), versionCode,item.getPersonId());
if (Objects.nonNull(versionCode) && versionCode >= 330 && ReceiveTypeEnum.CM_LEADER.equals(item.getReceiveType())) {
imMessage.setAppClient("cmp");
}

1
integration-test/src/test/resources/message.http
View File

@ -22,6 +22,7 @@ Content-Type: application/json
"toId": [
65550
],
"personAppVersionCode": {"65550": 65550},
"type": "GENERAL_MESSAGE"
}

4
msg-center-api/src/main/java/cn/axzo/msg/center/api/request/GeneralMessageReq.java
View File

@ -70,8 +70,8 @@ public class GeneralMessageReq extends AbstractMessage implements Serializable {
}
/**
* versionCode 330
* personAppVersionCode {1: 330}
*/
public Integer versionCode;
private Map<Long,Integer> personAppVersionCode;
}