From f537f17702793f240581eb2108fd12aa70eec176 Mon Sep 17 00:00:00 2001 From: yanglin Date: Thu, 16 Jan 2025 12:37:48 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3502:=20=E6=B7=BB=E5=8A=A0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/service/todo/card/TodoSyncCardService.java | 4 ++-- .../message/service/todo/card/TodoSyncCardServiceTest.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) 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 2bbad21e..4487eeb5 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 @@ -221,13 +221,13 @@ public class TodoSyncCardService { } void syncTodoPresetButtonPressed(PresetButtonPressedMessage message) { - CardUpdatePresetButtonRequest request = new CardUpdatePresetButtonRequest(); - request.setAppCode(APP_CODE); Todo todo = todoDao.findTodoByCode(message.getTodoInfo().getIdentityCode()).orElse(null); if (todo == null) { log.warn("[syncTodoPresetButtonPressed] todo not found, message={}", message); return; } + CardUpdatePresetButtonRequest request = new CardUpdatePresetButtonRequest(); + request.setAppCode(APP_CODE); request.setTemplateCode(todo.getTemplateCode()); request.setBizCode(todo.getTemplateCode()); request.setSubBizCode(todo.getSubBizCode()); diff --git a/start/src/test/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardServiceTest.java b/start/src/test/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardServiceTest.java index b47c0acb..730f43f7 100644 --- a/start/src/test/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardServiceTest.java +++ b/start/src/test/java/cn/axzo/msg/center/message/service/todo/card/TodoSyncCardServiceTest.java @@ -2,6 +2,7 @@ package cn.axzo.msg.center.message.service.todo.card; import cn.axzo.framework.rocketmq.Event; import cn.axzo.msg.center.MsgCenterApplication; +import cn.axzo.msg.center.api.mq.PresetButtonPressedMessage; import cn.axzo.msg.center.api.mq.TodoUpdateMessage; import com.alibaba.fastjson.JSON; import lombok.RequiredArgsConstructor; @@ -21,9 +22,9 @@ class TodoSyncCardServiceTest { @Test void exec() { - String json = "{\"messageId\": \"d6b3b687-6ab9-416e-9836-6245d9043125\", \"messageSendTime\": 1736926166387, \"messageSendTimeStr\": \"2025-01-15 15:29:26\", \"operation\": \"send\", \"updateCard\": true, \"updatedTodo\": {\"bizCategory\": \"FLOW\", \"bizCode\": \"202501151529100000000\", \"bizDesc\": \"审批节点\", \"bizExtParam\": {\"[_BIZ_NODE_ALTER_]node_065414499288\": {\"activityId\": \"node_065414499288\", \"processInstanceId\": \"202501151529100000000\", \"retries\": 2}, \"[_INTERNAL_INITIATOR_]\": {\"assignerName\": \"杨期成\", \"ouId\": \"10401\", \"tenantId\": \"4949\", \"personId\": \"9000400630\", \"assignee\": \"1229802\", \"assigneeType\": \"3\", \"avatar\": \"https://axzo-public.oss-cn-chengdu.aliyuncs.com/oms/oms/cac12b80cac342b5b9fcef5f470b189e.jpg\"}, \"businessName\": \"工作流开发测试项目业务\", \"initiatorUserName\": \"杨期成\", \"[_INTERNAL_PROCESS_AGENT]\": true, \"activityId\": \"node_065414499288\", \"processStartTime\": \"2025-01-15 15:29:25\", \"assigneeName\": \"10400|9000400630\", \"processInstanceId\": \"202501151529100000000\", \"nrOfActiveInstances\": 1, \"[_INTERNAL_PROCESS_WORKSPACE_TYPE]\": 2, \"activityName\": \"审批节点\", \"processResult\": \"审批中\", \"[_CREATE_INSTANCE_PARAMS]\": \"{\\\"processDefinitionKey\\\":\\\"wfTestProj\\\",\\\"tenantId\\\":\\\"4949\\\",\\\"variables\\\":{\\\"[_INTERNAL_PROCESS_WORKSPACE_TYPE]\\\":2,\\\"[_INTERNAL_INITIATOR_]\\\":\\\"{\\\\\\\"assignee\\\\\\\":\\\\\\\"1229802\\\\\\\",\\\\\\\"assigneeType\\\\\\\":\\\\\\\"3\\\\\\\",\\\\\\\"assignerName\\\\\\\":\\\\\\\"杨期成\\\\\\\",\\\\\\\"avatar\\\\\\\":\\\\\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/oms/oms/cac12b80cac342b5b9fcef5f470b189e.jpg\\\\\\\",\\\\\\\"ouId\\\\\\\":\\\\\\\"10401\\\\\\\",\\\\\\\"personId\\\\\\\":\\\\\\\"9000400630\\\\\\\",\\\\\\\"tenantId\\\\\\\":\\\\\\\"4949\\\\\\\"}\\\",\\\"[_BIZ_ORG_RELATION_]\\\":{\\\"orgScopes\\\":[{\\\"workspaceType\\\":2,\\\"workspaceId\\\":4949,\\\"ouId\\\":10401,\\\"nodeId\\\":21335}]},\\\"[_WORKFLOW_ENGINE_VERSION_]\\\":\\\"1.5.1\\\",\\\"[_PENDING_VARIABLES]\\\":{},\\\"[_INTERNAL_PROCESS_AGENT]\\\":true},\\\"pendingVariables\\\":{},\\\"cooperationOrg\\\":{\\\"orgScopes\\\":[{\\\"workspaceType\\\":2,\\\"workspaceId\\\":4949,\\\"ouId\\\":10401,\\\"nodeId\\\":21335}]},\\\"businessKey\\\":\\\"40\\\",\\\"initiator\\\":{\\\"assignee\\\":\\\"1229802\\\",\\\"assigneeType\\\":\\\"3\\\",\\\"assignerName\\\":\\\"杨期成\\\",\\\"personId\\\":\\\"9000400630\\\",\\\"tenantId\\\":\\\"4949\\\",\\\"ouId\\\":\\\"10401\\\",\\\"avatar\\\":\\\"https://axzo-public.oss-cn-chengdu.aliyuncs.com/oms/oms/cac12b80cac342b5b9fcef5f470b189e.jpg\\\"},\\\"async\\\":false,\\\"startFormVariables\\\":{}}\", \"taskStartTime\": \"2025-01-15 15:29:25\", \"taskUserName\": \"杨期成\", \"[_WORKFLOW_ENGINE_VERSION_]\": \"1.5.1\", \"tenantId\": \"4949\", \"businessKey\": \"40\", \"operatorType\": \"\", \"taskId\": \"202501151529100000049\", \"[_PENDING_VARIABLES]\": {}, \"processInstanceName\": \"工作流业务测试项目流程\", \"nrOfCompletedInstances\": 0}, \"bizFinalState\": null, \"bizFlag\": \"\", \"content\": \"你好\", \"deadline\": null, \"executorId\": 0, \"executorName\": \"杨期成\", \"executorOuId\": 10400, \"executorPersonId\": 9000400630, \"executorType\": \"NOT_SUPPORT\", \"executorWorkspaceId\": 4946, \"executorWorkspaceName\": \"成都建工第七建筑工程有限公司\", \"identityCode\": \"fccb21474a4645edb907e9a9828c3d46\", \"orgType\": \"ENT\", \"promoterId\": 0, \"promoterName\": \"杨期成\", \"promoterOuId\": 10401, \"promoterPersonId\": 9000400630, \"promoterType\": \"NOT_SUPPORT\", \"promoterWorkspaceId\": 4949, \"promoterWorkspaceName\": \"核西南院设计有限公司\", \"requestNo\": \"1a9c93f122824f648763bd311c2f3118\", \"routerParams\": {\"processNodeCode\": \"node_065414499288\", \"processInstanceId\": \"202501151529100000000\", \"creator\": \"杨期成\", \"userAgreeSignature\": true, \"businessTypeName\": \"审批节点\", \"businessKey\": \"40\", \"tenantId\": \"4946\", \"startTime\": \"2025-01-15 15:29:25\", \"title\": \"工作流业务测试项目流程\", \"taskId\": \"202501151529100000049\", \"processNodeName\": \"审批节点\"}, \"srcTemplateCode\": \"a7c79c432efc4ecba71790677d35cc59\", \"state\": \"HAS_BEEN_SENT\", \"subBizCode\": \"202501151529100000049\", \"templateCode\": \"a7c79c432efc4ecba71790677d35cc59\", \"title\": \"你好\", \"todoBusinessId\": 146907, \"todoId\": 843354, \"type\": \"EXECUTABLE\"}}"; - TodoUpdateMessage message = JSON.parseObject(json, TodoUpdateMessage.class); - todoSyncCardService.onMessage(new Event(), message); + String json = "{\"btnPressedRequestNo\": \"437fb871912e4f2f8d7c5d7969164061\", \"messageId\": \"ec98f521-e6a0-4330-a650-245bad478853\", \"messageSendTime\": 1737001768749, \"messageSendTimeStr\": \"2025-01-16 12:29:28\", \"presetButtonType\": \"AGREE\", \"todoInfo\": {\"bizCategory\": \"OTHER\", \"bizCode\": \"test-17\", \"bizDesc\": \"\", \"bizExtParam\": {\"assistLogName\": \"测试\"}, \"bizFinalState\": null, \"bizFlag\": \"\", \"content\": \"系统提示，无需关注\", \"deadline\": null, \"executorId\": 0, \"executorName\": \"test\", \"executorOuId\": 10616, \"executorPersonId\": 9000399522, \"executorType\": \"NOT_SUPPORT\", \"executorWorkspaceId\": 0, \"executorWorkspaceName\": \"\", \"identityCode\": \"68d6f7d480b44891a65d07e482d848e9\", \"orgType\": \"UNKNOWN\", \"promoterId\": 0, \"promoterName\": \"杨林\", \"promoterOuId\": 0, \"promoterPersonId\": 6678911, \"promoterType\": \"NOT_SUPPORT\", \"promoterWorkspaceId\": 0, \"promoterWorkspaceName\": \"\", \"requestNo\": \"c0fef3f2dc7d4264b33d3aafa1906636\", \"routerParams\": {}, \"srcTemplateCode\": \"7aceab1f31ec4570a98cdaf7f8940c61\", \"state\": \"HAS_BEEN_SENT\", \"subBizCode\": \"aaaa\", \"templateCode\": \"7aceab1f31ec4570a98cdaf7f8940c61\", \"title\": \"系统提示\", \"todoBusinessId\": 147049, \"todoId\": 843602, \"type\": \"EXECUTABLE\"}}"; + PresetButtonPressedMessage message = JSON.parseObject(json, PresetButtonPressedMessage.class); + todoSyncCardService.syncTodoPresetButtonPressed(message); } } \ No newline at end of file