diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardManager.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardManager.java index 6125310f..2a4da9fc 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardManager.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/CardManager.java @@ -215,7 +215,7 @@ public class CardManager { UpdateStateResult result = executor.update(new SetActionPerformedBuilder( executor, button, CardBizState.fromPresetButton(request.getPresetButtonType()))); if (result == UpdateStateResult.UPDATED) { - cardBroadcaster.firePresetButtonPressed(executor.updatedCards, request); + cardBroadcaster.firePresetButtonPressed(executor.updatedCards, request, requestContext); executor.updateCardLogger.reloadAndLogCards("presetButtonPressed:mq:success"); } else { executor.updateCardLogger.reloadAndLogCards("presetButtonPressed:cardNoUpdate"); diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/broadcast/CardBroadcaster.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/broadcast/CardBroadcaster.java index b5b81a04..7c725bab 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/broadcast/CardBroadcaster.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/card/broadcast/CardBroadcaster.java @@ -5,6 +5,7 @@ import cn.axzo.msg.center.api.mq.CardInfo; import cn.axzo.msg.center.api.mq.CardPresetButtonPressedMessage; import cn.axzo.msg.center.dal.CardDao; import cn.axzo.msg.center.domain.entity.Card; +import cn.axzo.msg.center.message.service.card.CardRequestContext; import cn.axzo.msg.center.mq.MqMessageRecord; import cn.axzo.msg.center.mq.MqProducer; import cn.axzo.msg.center.service.enums.MqMessageType; @@ -25,13 +26,16 @@ public class CardBroadcaster { private final CardDao cardDao; private final MqProducer mqProducer; - public void firePresetButtonPressed(List cards, CardPresetButtonRequest request) { + public void firePresetButtonPressed(List cards, + CardPresetButtonRequest request, + CardRequestContext requestContext) { for (Card card : cardDao.reloadCards(cards)) { CardPresetButtonPressedMessage message = new CardPresetButtonPressedMessage(); message.setPresetButtonType(request.getPresetButtonType()); message.setOperatorId(request.getOperatorId()); message.setOperatorName(request.getOperatorName()); message.setCardInfo(BeanMapper.copyBean(card, CardInfo.class)); + message.setBatchNo(requestContext.getBatchNo()); mqProducer.send(MqMessageRecord .builder(MqMessageType.CARD_PRESET_BUTTON_PRESSED, message) .messageKey(card.getIdentityCode()) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardService.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardService.java index 34b9a461..2568342b 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardService.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardService.java @@ -211,7 +211,8 @@ public class TodoSyncCardService { request.setPresetButtonType(message.getPresetButtonType()); request.setOperatorId(message.getOperatorId()); request.setOperatorName(message.getOperatorName()); - TodoRequestContext ctx = TodoRequestContext.create("syncCardPresetButtonPressed:finished", message); + TodoRequestContext ctx = TodoRequestContext.create( + "syncCardPresetButtonPressed:finished", message.getBatchNo(), message); try { if (todoManager.firePresetButtonPressed(request, false)) todoLogger.logTodoUpdated(ctx, todo); diff --git a/msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/CardPresetButtonPressedMessage.java b/msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/CardPresetButtonPressedMessage.java index 79fabe22..402a002b 100644 --- a/msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/CardPresetButtonPressedMessage.java +++ b/msg-center-api/src/main/java/cn/axzo/msg/center/api/mq/CardPresetButtonPressedMessage.java @@ -30,4 +30,5 @@ public class CardPresetButtonPressedMessage extends MqMessage implements Seriali */ private CardInfo cardInfo; + private String batchNo; } \ No newline at end of file