From df4a3ec355be904bdde35257bab2fc60bc12240f Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 27 Feb 2024 15:41:54 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E8=B0=83=E6=95=B4=20Activity=20?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=8F=91=E9=80=81=20MQ=20=E7=9A=84=20message?=
 =?UTF-8?q?Key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/engine/listener/EngineTaskEventListener.java       | 2 +-
 .../listener/activity/RocketMqBpmActivityEventListener.java | 2 +-
 .../listener/notice/RocketMqMessagePushEventListener.java   | 3 ++-
 .../controller/web/bpmn/BpmnProcessInstanceController.java  | 6 +++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java
index c59fa989f..e872cdfaf 100644
--- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java
+++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java
@@ -57,7 +57,7 @@ public class EngineTaskEventListener implements TaskListener {
             }
         });
         stopWatch.stop();
-        log.info(stopWatch.shortSummary());
+        log.info("StopWatch '" + stopWatch.currentTaskName() + "': running time = " + stopWatch.getTotalTimeSeconds() + " s");
 
     }
 
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java
index 98b3d013d..6b31e9377 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java
@@ -184,7 +184,7 @@ public class RocketMqBpmActivityEventListener implements BpmnActivityEventListen
         eventProducer.send(Event.builder()
                 .shardingKey(dto.getProcessInstanceId())
                 .eventCode(eventEnum.getEventCode())
-                .targetId(dto.getActivityId())
+                .targetId(dto.getProcessInstanceId())
                 .targetType(eventEnum.getTag())
                 .data(dto)
                 .build());
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
index 896d3ad46..d8174238f 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
@@ -33,6 +33,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static cn.axzo.workflow.common.constant.BpmnConstants.BIZ_ORG_RELATION;
+import static cn.axzo.workflow.common.constant.BpmnConstants.BPM_MODEL_CATEGORY;
 import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_ACTIVITY_RELATION_ASSIGNEE_LIST_INFO_SNAPSHOT;
 import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_DELETE_PROCESS_FLAG;
 import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_END_TENANT_ID;
@@ -237,7 +238,7 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis
             }
         }
 
-        categoryService.getById(Long.valueOf(processInstance.getCategory())).ifPresent(category -> {
+        categoryService.get(BPM_MODEL_CATEGORY, processInstance.getCategory()).ifPresent(category -> {
             variables.put(VAR_BUSINESS_NAME, category.getLabel());
         });
 
diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
index 2331f1073..6e0bea181 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
@@ -59,6 +59,8 @@ public class BpmnProcessInstanceController implements ProcessInstanceApi {
     private BpmnProcessInstanceService bpmnProcessInstanceService;
     @Value("${spring.profiles.active}")
     private String profile;
+    @Value("${workflow.sendDingTalk:true}")
+    private Boolean sendDingTalk;
 
     /**
      * 我发起的审批列表
@@ -87,7 +89,9 @@ public class BpmnProcessInstanceController implements ProcessInstanceApi {
         } catch (Exception e) {
             String errorMsg = Objects.nonNull(e.getCause()) ? e.getCause().getMessage() : e.getMessage();
             LogUtil.error(LogUtil.ErrorType.ERROR_BUSINESS, "发起审核createProcessInstance===>>>异常：{}", errorMsg);
-            DingTalkUtils.sendDingTalk(profile, dto, e);
+            if (sendDingTalk) {
+                DingTalkUtils.sendDingTalk(profile, dto, e);
+            }
             return CommonResponse.fail(errorMsg);
         }
         stopWatch.stop();