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

Merge remote-tracking branch 'origin/feature/REQ-3201' into feature/REQ-3201

Browse Source
This commit is contained in:
yanglin 2024-12-16 16:11:00 +08:00
commit a01a34e60e
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java
View File

@ -333,7 +333,7 @@ public class PendingMessageNewController implements PendingMessageClient {
@Override
public CommonResponse<Boolean> 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);
}

6
inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/TodoWithCardWrapper.java
View File

@ -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 构建对象

5
inside-notices/src/main/java/cn/axzo/msg/center/message/service/todo/manage/TodoManager.java
View File

@ -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);