zhouz/huachuang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/20260716/wms-module' into feature/20260716/wms-module

Browse Source
This commit is contained in:
zhouz
2026-07-23 13:28:24 +08:00
parent 05c3d92abf 7360ac1c0f
commit 410c929764
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
nl-module-task/nl-module-task-server/src/main/java/cn/code/nl/module/task/manage/TransportTaskOperationManager.java
View File

@@ -18,6 +18,8 @@ import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock; import org.redisson.api.RLock;
import org.redisson.api.RedissonClient; import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import org.springframework.transaction.support.TransactionSynchronization;
import org.springframework.transaction.support.TransactionSynchronizationManager;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.Map; import java.util.Map;
@@ -116,7 +118,19 @@ public class TransportTaskOperationManager {
task.setCallbackStatus(CallbackStatusEnum.PENDING.getCode()); task.setCallbackStatus(CallbackStatusEnum.PENDING.getCode());
transportTaskMapper.updateById(task); transportTaskMapper.updateById(task);
publishEvent(task, TaskEventTypeEnum.TASK_FINISHED, reqDTO.getPayload()); // MQ 在事务提交后发送，避免 Consumer 读到未提交的数据
Map<String, Object> payload = reqDTO.getPayload();
if (TransactionSynchronizationManager.isSynchronizationActive()) {
TransactionSynchronizationManager.registerSynchronization(
new TransactionSynchronization() {
@Override
public void afterCommit() {
publishEvent(task, TaskEventTypeEnum.TASK_FINISHED, payload);
}
});
} else {
publishEvent(task, TaskEventTypeEnum.TASK_FINISHED, payload);
}
} }
/** /**
@@ -139,7 +153,19 @@ public class TransportTaskOperationManager {
task.setCallbackStatus(CallbackStatusEnum.PENDING.getCode()); task.setCallbackStatus(CallbackStatusEnum.PENDING.getCode());
transportTaskMapper.updateById(task); transportTaskMapper.updateById(task);
publishEvent(task, TaskEventTypeEnum.TASK_CANCELLED, reqDTO.getPayload()); // MQ 在事务提交后发送，避免 Consumer 读到未提交的数据
Map<String, Object> payload = reqDTO.getPayload();
if (TransactionSynchronizationManager.isSynchronizationActive()) {
TransactionSynchronizationManager.registerSynchronization(
new TransactionSynchronization() {
@Override
public void afterCommit() {
publishEvent(task, TaskEventTypeEnum.TASK_CANCELLED, payload);
}
});
} else {
publishEvent(task, TaskEventTypeEnum.TASK_CANCELLED, payload);
}
} }
/** /**