diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java index 3fb8ef22..31fb59bd 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java @@ -333,7 +333,7 @@ public class PendingMessageNewController implements PendingMessageClient { @Override public CommonResponse firePresetButtonPressed(PresetButtonPressedRequest req) { log.info("firePresetButtonPressed, request={}", JSON.toJSONString(req)); - boolean result = todoManager.firePresetButtonPressed(req); + boolean result = todoManager.firePresetButtonPressed(req, true); // 产品要求提示信息 return CommonResponse.success(200, "处理成功", result); } diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoWithCardWrapper.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoWithCardWrapper.java index 4f04cd62..10d1e82b 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoWithCardWrapper.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoWithCardWrapper.java @@ -42,7 +42,11 @@ public class TodoWithCardWrapper { /** * 点击预设按钮-同步卡片 */ - public void fireCardWhenPresetButtonPressedByTodo(PresetButtonPressedRequest request, Todo todo) { + public void fireCardWhenPresetButtonPressedByTodo(PresetButtonPressedRequest request, Todo todo, boolean isSyncCard) { + //是否同步卡片信息,true:同步;false:不同步 + if (!isSyncCard) { + return; + } log.info("TodoWithCardWrapper#fireCardWhenPresetButtonPressedByTodo start,request:{},todo:{}", JSON.toJSONString(request), JSON.toJSONString(todo)); try { //1 构建对象 diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java index 0223d363..cb56e272 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java @@ -606,7 +606,7 @@ public class TodoManager { * 点击预设按钮 */ @Transactional(rollbackFor = Exception.class) - public boolean firePresetButtonPressed(PresetButtonPressedRequest request) { + public boolean firePresetButtonPressed(PresetButtonPressedRequest request, boolean isSyncCard) { Todo todo = todoDao.findTodoByCode(request.getIdentityCode()).orElse(null); if (todo == null) return false; @@ -621,7 +621,8 @@ public class TodoManager { if (isAdvancedOrCompleted) { sendMqMessageOnPresetButtonPressed(ctx, request, todo); todoBroadcaster.fireTodoUpdates("presetButtonPressed", todo); - todoWithCardWrapper.fireCardWhenPresetButtonPressedByTodo(request, todo); + todoWithCardWrapper.fireCardWhenPresetButtonPressedByTodo(request, todo,isSyncCard); + // 如果不是重复发送, 就只记一条日志. 如果是重复发送, 就单独记录一条日志 if (!advanceResult.isAdvanced()) todoLogger.logTodoUpdated(ctx, todo);