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

REQ-3201: ack

Browse Source
This commit is contained in:
yanglin 2024-12-13 10:39:11 +08:00
parent 6c0d70659b
commit 0d081482d4
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
im-center-server/src/main/java/cn/axzo/im/updatable/UpdatableMessageManager.java
View File

@ -180,11 +180,12 @@ public class UpdatableMessageManager {
List<List<UpdateMessageRequest.Update>> batches = Lists.partition(
request.getUpdates(), props.getUpdatableMessageMaxLockRecords());
for (List<UpdateMessageRequest.Update> batch : batches)
transactionTemplate.executeWithoutResult(unused -> updateMessageImpl(batch, response));
transactionTemplate.executeWithoutResult(unused -> updateMessageImpl(request, batch, response));
return response;
}
private void updateMessageImpl(List<UpdateMessageRequest.Update> requestUpdates,
private void updateMessageImpl(UpdateMessageRequest request,
List<UpdateMessageRequest.Update> requestUpdates,
MessageUpdateResponse response) {
List<UpdatableMessage> requestMessages = updatableMessageDao
.getByBizMessageIdsForUpdate(collectBizMessageIds(requestUpdates));
@ -214,7 +215,7 @@ public class UpdatableMessageManager {
updatableMessageDao.getBaseMapper().incrDataVersion(updateIds);
messageUpdateRetryService.scheduleNextRetry(updateIds);
AddUpdateHistoryResult result = updateSupport
.addUpdateHistories("updateHistoryCreated", validUpdates);
.addUpdateHistories(request, "updateHistoryCreated", validUpdates);
updateSupport.updateHistoryId(result, UpdatableMessage::setUpdateHistoryId);
}
}

6
im-center-server/src/main/java/cn/axzo/im/updatable/UpdateSupport.java
View File

@ -44,7 +44,9 @@ public class UpdateSupport {
private final CardManipulateCollectorFactory cardManipulateCollectorFactory;
public AddUpdateHistoryResult addUpdateHistories(
String context, List<? extends MessageUpdateInfo> updates) {
Object request,
String context,
List<? extends MessageUpdateInfo> updates) {
List<UpdatableMessage> messages = updatableMessageDao
.getByBizMessageIds(collectBizMessageIds(updates));
Map<String, UpdatableMessage> bizMessageId2Message = messages
@ -99,7 +101,7 @@ public class UpdateSupport {
history.setRecordExt(recordExt);
history.setTimestampForSend(new Date());
UpdatableMessageLog messageLog = message.toMessageLog(null);
UpdatableMessageLog messageLog = message.toMessageLog(request);
collector.addLog(messageLog);
messageLog2History.put(messageLog, history);
messageLog.setDataVersion(message.getDataVersion());

2
im-center-server/src/main/java/cn/axzo/im/updatable/retry/MessageUpdateRetryService.java
View File

@ -93,7 +93,7 @@ public class MessageUpdateRetryService {
updatableMessageDao.getBaseMapper().incrRetryCount(messageIds);
List<UpdatableMessage> messages = updatableMessageDao.listByIds(messageIds);
AddUpdateHistoryResult result = updateSupport
.addUpdateHistories("retryUpdateHistoryCreated", messages);
.addUpdateHistories(null, "retryUpdateHistoryCreated", messages);
updateSupport.updateHistoryId(result, UpdatableMessage::setRetryHistoryId);
}
}