|
|
@@ -28,6 +28,59 @@ public class IMSender {
|
|
|
|
|
|
private final MessageListenerMulticaster listenerMulticaster;
|
|
|
|
|
|
+
|
|
|
+ public<T> void sendSystemMessage(IMSystemMessage<T> message){
|
|
|
+ // 根据群聊每个成员所连的IM-server,进行分组
|
|
|
+ Map<String, IMUserInfo> sendMap = new HashMap<>();
|
|
|
+ for (Integer terminal : message.getRecvTerminals()) {
|
|
|
+ message.getRecvIds().forEach(id -> {
|
|
|
+ String key = String.join(":", IMRedisKey.IM_USER_SERVER_ID, id.toString(), terminal.toString());
|
|
|
+ sendMap.put(key,new IMUserInfo(id, terminal));
|
|
|
+ });
|
|
|
+ }
|
|
|
+ // 批量拉取
|
|
|
+ List<Object> serverIds = redisMQTemplate.opsForValue().multiGet(sendMap.keySet());
|
|
|
+ // 格式:map<服务器id,list<接收方>>
|
|
|
+ Map<Integer, List<IMUserInfo>> serverMap = new HashMap<>();
|
|
|
+ List<IMUserInfo> offLineUsers = new LinkedList<>();
|
|
|
+ int idx = 0;
|
|
|
+ for (Map.Entry<String,IMUserInfo> entry : sendMap.entrySet()) {
|
|
|
+ Integer serverId = (Integer)serverIds.get(idx++);
|
|
|
+ if (!Objects.isNull(serverId)) {
|
|
|
+ List<IMUserInfo> list = serverMap.computeIfAbsent(serverId, o -> new LinkedList<>());
|
|
|
+ list.add(entry.getValue());
|
|
|
+ } else {
|
|
|
+ // 加入离线列表
|
|
|
+ offLineUsers.add(entry.getValue());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ // 逐个server发送
|
|
|
+ for (Map.Entry<Integer, List<IMUserInfo>> entry : serverMap.entrySet()) {
|
|
|
+ IMRecvInfo recvInfo = new IMRecvInfo();
|
|
|
+ recvInfo.setCmd(IMCmdType.SYSTEM_MESSAGE.code());
|
|
|
+ recvInfo.setReceivers(new LinkedList<>(entry.getValue()));
|
|
|
+ recvInfo.setServiceName(appName);
|
|
|
+ recvInfo.setSendResult(message.getSendResult());
|
|
|
+ recvInfo.setData(message.getData());
|
|
|
+ // 推送至队列
|
|
|
+ String key = String.join(":", IMRedisKey.IM_MESSAGE_SYSTEM_QUEUE, entry.getKey().toString());
|
|
|
+ redisMQTemplate.opsForList().rightPush(key, recvInfo);
|
|
|
+ }
|
|
|
+ // 对离线用户回复消息状态
|
|
|
+ if(message.getSendResult() && !offLineUsers.isEmpty()){
|
|
|
+ List<IMSendResult> results = new LinkedList<>();
|
|
|
+ for (IMUserInfo offLineUser : offLineUsers) {
|
|
|
+ IMSendResult result = new IMSendResult();
|
|
|
+ result.setReceiver(offLineUser);
|
|
|
+ result.setCode(IMSendCode.NOT_ONLINE.code());
|
|
|
+ result.setData(message.getData());
|
|
|
+ results.add(result);
|
|
|
+ }
|
|
|
+ listenerMulticaster.multicast(IMListenerType.SYSTEM_MESSAGE, results);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
public<T> void sendPrivateMessage(IMPrivateMessage<T> message) {
|
|
|
List<IMSendResult> results = new LinkedList<>();
|
|
|
if(!Objects.isNull(message.getRecvId())){
|
|
|
@@ -84,10 +137,10 @@ public class IMSender {
|
|
|
if(message.getSendResult() && !results.isEmpty()){
|
|
|
listenerMulticaster.multicast(IMListenerType.PRIVATE_MESSAGE, results);
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
public<T> void sendGroupMessage(IMGroupMessage<T> message) {
|
|
|
-
|
|
|
// 根据群聊每个成员所连的IM-server,进行分组
|
|
|
Map<String, IMUserInfo> sendMap = new HashMap<>();
|
|
|
for (Integer terminal : message.getRecvTerminals()) {
|
|
|
@@ -104,7 +157,7 @@ public class IMSender {
|
|
|
int idx = 0;
|
|
|
for (Map.Entry<String,IMUserInfo> entry : sendMap.entrySet()) {
|
|
|
Integer serverId = (Integer)serverIds.get(idx++);
|
|
|
- if (serverId != null) {
|
|
|
+ if (!Objects.isNull(serverId)) {
|
|
|
List<IMUserInfo> list = serverMap.computeIfAbsent(serverId, o -> new LinkedList<>());
|
|
|
list.add(entry.getValue());
|
|
|
} else {
|
|
|
@@ -136,7 +189,7 @@ public class IMSender {
|
|
|
String key = String.join(":", IMRedisKey.IM_USER_SERVER_ID, message.getSender().getId().toString(), terminal.toString());
|
|
|
Integer serverId = (Integer)redisMQTemplate.opsForValue().get(key);
|
|
|
// 如果终端在线,将数据存储至redis,等待拉取推送
|
|
|
- if (serverId != null) {
|
|
|
+ if (!Objects.isNull(serverId)) {
|
|
|
IMRecvInfo recvInfo = new IMRecvInfo();
|
|
|
recvInfo.setCmd(IMCmdType.GROUP_MESSAGE.code());
|
|
|
recvInfo.setSender(message.getSender());
|