wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 调整 Activity 事件发送 MQ 的 messageKey

Browse Source
This commit is contained in:
wangli 2024-02-27 15:41:54 +08:00
parent 3f9dfdd133
commit df4a3ec355
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/listener/EngineTaskEventListener.java
View File

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

2
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/activity/RocketMqBpmActivityEventListener.java
View File

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

3
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
View File

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

6
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessInstanceController.java
View File

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