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

REQ-3345: 如果聊天消息只有一个人的情况下，同步发送

Browse Source
This commit is contained in:
yanglin 2025-02-25 18:14:25 +08:00
parent 8569f32333
commit 6c87f57624
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
im-center-server/src/main/java/cn/axzo/im/controller/MessageController.java
View File

@ -27,7 +27,6 @@ import cn.axzo.im.center.api.vo.resp.MessageUpdateResponse;
import cn.axzo.im.center.api.vo.resp.UpdatableMessageSendResult;
import cn.axzo.im.center.api.vo.resp.UserAccountResp;
import cn.axzo.im.center.common.enums.AppTypeEnum;
import cn.axzo.im.channel.netease.dto.MessageDispatchResponse;
import cn.axzo.im.entity.AccountRegister;
import cn.axzo.im.entity.MessageHistory;
import cn.axzo.im.entity.MessageTask;
@ -289,15 +288,7 @@ public class MessageController implements MessageApi {
task = messageTaskService.getById(task.getId());
List<Long> historyIds = messageTaskService.createMessageHistory(task);
MessageHistory history = messageHistoryService.getById(historyIds.get(0));
MessageDispatchResponse response = commonSendOneHandler.send(history);
if (response.isSuccess()) {
messageHistoryService.setSendSuccess(history, response.getMsgid(), null);
log.info("sendChatMessage, send success, historyId={}, taskId={}, bizId={}",
history.getId(), history.getImMessageTaskId(), history.getBizId());
} else {
log.warn("sendChatMessage, send failed, historyId={}, taskId={}, bizId={}, failReason={}",
history.getId(), history.getImMessageTaskId(), history.getBizId(), response.getDesc());
}
commonSendOneHandler.updateSyncSendState(history, commonSendOneHandler.send(history));
}
return task.getId();
});

15
im-center-server/src/main/java/cn/axzo/im/send/handler/CommonSendOneHandler.java
View File

@ -7,13 +7,16 @@ import cn.axzo.im.channel.netease.dto.MessageDispatchResponse;
import cn.axzo.im.entity.MessageHistory;
import cn.axzo.im.send.MessageHistoryNimLogger;
import cn.axzo.im.send.SendExecutor;
import cn.axzo.im.service.impl.MessageHistoryServiceImpl;
import cn.axzo.im.utils.ImProperties;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
/**
* @author yanglin
*/
@Slf4j
@Component
@RequiredArgsConstructor
public class CommonSendOneHandler extends SendOneHandler {
@ -21,6 +24,7 @@ public class CommonSendOneHandler extends SendOneHandler {
private final ImProperties props;
private final IMChannelProvider imChannelProvider;
private final MessageHistoryNimLogger messageHistoryNimLogger;
private final MessageHistoryServiceImpl messageHistoryService;
@Override
public void sendAndSubmitUpdate(SendExecutor<MessageHistory> executor, MessageHistory history) {
@ -55,6 +59,17 @@ public class CommonSendOneHandler extends SendOneHandler {
return imChannelProvider.dispatchMessage(sendRequest);
}
public void updateSyncSendState(MessageHistory history, MessageDispatchResponse response) {
if (response.isSuccess()) {
messageHistoryService.setSendSuccess(history, response.getMsgid(), null);
log.info("sync send success, historyId={}, taskId={}, bizId={}",
history.getId(), history.getImMessageTaskId(), history.getBizId());
} else {
log.warn("sync send failed, historyId={}, taskId={}, bizId={}, failReason={}",
history.getId(), history.getImMessageTaskId(), history.getBizId(), response.getDesc());
}
}
@Override
ImProperties getProps() {
return props;