Browse Source

[feat]

1、修复工作流无法推送消息
pull/1/head
杨威 4 months ago
parent
commit
ba652ffedf
  1. 2
      dk-common/common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java
  2. 6
      dk-modules/workflow/src/main/java/org/dromara/workflow/handler/FlwAlertHandler.java
  3. 6
      dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

2
dk-common/common-sse/src/main/java/org/dromara/common/sse/listener/SseTopicListener.java

@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner; import org.springframework.boot.ApplicationRunner;
import org.springframework.core.Ordered; import org.springframework.core.Ordered;
import org.springframework.stereotype.Component;
/** /**
* SSE 主题订阅监听器 * SSE 主题订阅监听器
@ -14,6 +15,7 @@ import org.springframework.core.Ordered;
* @author Lion Li * @author Lion Li
*/ */
@Slf4j @Slf4j
@Component
public class SseTopicListener implements ApplicationRunner, Ordered { public class SseTopicListener implements ApplicationRunner, Ordered {
@Autowired @Autowired

6
dk-modules/workflow/src/main/java/org/dromara/workflow/handler/FlwAlertHandler.java

@ -28,7 +28,7 @@ public class FlwAlertHandler implements FlwCommonHandler {
* *
* @param processEvent 参数 * @param processEvent 参数
*/ */
@EventListener(condition = "#processEvent.flowCode.startsWith('leave')") @EventListener(condition = "#processEvent.flowCode.startsWith('alert')")
@Override @Override
public void processHandler(ProcessEvent processEvent) { public void processHandler(ProcessEvent processEvent) {
alertService.updateAlertStatus(processEvent.getBusinessId(),processEvent.getStatus()); alertService.updateAlertStatus(processEvent.getBusinessId(),processEvent.getStatus());
@ -40,7 +40,7 @@ public class FlwAlertHandler implements FlwCommonHandler {
* *
* @param processCreateTaskEvent 参数 * @param processCreateTaskEvent 参数
*/ */
@EventListener(condition = "#processCreateTaskEvent.flowCode.startsWith('leave')") @EventListener(condition = "#processCreateTaskEvent.flowCode.startsWith('alert')")
@Override @Override
public void processCreateTaskHandler(ProcessCreateTaskEvent processCreateTaskEvent) { public void processCreateTaskHandler(ProcessCreateTaskEvent processCreateTaskEvent) {
alertService.updateAlertStatus(processCreateTaskEvent.getBusinessId(), BusinessStatusEnum.WAITING.getStatus()); alertService.updateAlertStatus(processCreateTaskEvent.getBusinessId(), BusinessStatusEnum.WAITING.getStatus());
@ -52,7 +52,7 @@ public class FlwAlertHandler implements FlwCommonHandler {
* *
* @param processDeleteEvent 参数 * @param processDeleteEvent 参数
*/ */
@EventListener(condition = "#processDeleteEvent.flowCode.startsWith('leave')") @EventListener(condition = "#processDeleteEvent.flowCode.startsWith('alert')")
@Override @Override
public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) { public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) {

6
dk-modules/workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java

@ -130,7 +130,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
* *
* @param processEvent 参数 * @param processEvent 参数
*/ */
// @EventListener(condition = "#processEvent.flowCode.startsWith('leave')") @EventListener(condition = "#processEvent.flowCode.startsWith('leave')")
public void processHandler(ProcessEvent processEvent) { public void processHandler(ProcessEvent processEvent) {
TenantHelper.dynamic(processEvent.getTenantId(), () -> { TenantHelper.dynamic(processEvent.getTenantId(), () -> {
log.info("当前任务执行了{}", processEvent.toString()); log.info("当前任务执行了{}", processEvent.toString());
@ -163,7 +163,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
* *
* @param processCreateTaskEvent 参数 * @param processCreateTaskEvent 参数
*/ */
// @EventListener(condition = "#processCreateTaskEvent.flowCode.startsWith('leave')") @EventListener(condition = "#processCreateTaskEvent.flowCode.startsWith('leave')")
public void processCreateTaskHandler(ProcessCreateTaskEvent processCreateTaskEvent) { public void processCreateTaskHandler(ProcessCreateTaskEvent processCreateTaskEvent) {
TenantHelper.dynamic(processCreateTaskEvent.getTenantId(), () -> { TenantHelper.dynamic(processCreateTaskEvent.getTenantId(), () -> {
log.info("当前任务创建了{}", processCreateTaskEvent.toString()); log.info("当前任务创建了{}", processCreateTaskEvent.toString());
@ -180,7 +180,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
* *
* @param processDeleteEvent 参数 * @param processDeleteEvent 参数
*/ */
// @EventListener(condition = "#processDeleteEvent.flowCode.startsWith('leave')") @EventListener(condition = "#processDeleteEvent.flowCode.startsWith('leave')")
public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) { public void processDeleteHandler(ProcessDeleteEvent processDeleteEvent) {
TenantHelper.dynamic(processDeleteEvent.getTenantId(), () -> { TenantHelper.dynamic(processDeleteEvent.getTenantId(), () -> {
log.info("监听删除流程事件,当前任务执行了{}", processDeleteEvent.toString()); log.info("监听删除流程事件,当前任务执行了{}", processDeleteEvent.toString());

Loading…
Cancel
Save