From f1e17d6eb4fd6f7c75098e9e0f9e1b8a08647969 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Wed, 30 Oct 2024 16:50:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-3114)=20-=20=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E5=BC=82=E5=B8=B8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mq/consumer/DingtalkReceiveListener.java | 56 +++++++++++-------- .../mq/producer/DingtalkSendProducer.java | 22 ++++---- 2 files changed, 44 insertions(+), 34 deletions(-) diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/consumer/DingtalkReceiveListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/consumer/DingtalkReceiveListener.java index 1c8a0e809..b8dc279dc 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/consumer/DingtalkReceiveListener.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/consumer/DingtalkReceiveListener.java @@ -3,10 +3,10 @@ package cn.axzo.workflow.server.outside.mq.consumer; import cn.axzo.framework.rocketmq.Event; import cn.axzo.framework.rocketmq.EventConsumer; import cn.axzo.framework.rocketmq.EventHandler; -import cn.axzo.riven.client.common.enums.DingtalkEventEnum; -import cn.axzo.riven.client.model.DingtalkReceiveMqModel; -import cn.axzo.riven.client.model.DingtalkSendMqModel; -import cn.axzo.riven.client.model.SampleText; +//import cn.axzo.riven.client.common.enums.DingtalkEventEnum; +//import cn.axzo.riven.client.model.DingtalkReceiveMqModel; +//import cn.axzo.riven.client.model.DingtalkSendMqModel; +//import cn.axzo.riven.client.model.SampleText; import cn.axzo.workflow.server.outside.mq.producer.DingtalkSendProducer; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; @@ -24,7 +24,7 @@ import java.util.Objects; * @since 2024-10-25 11:16 */ @Slf4j -@Component +//@Component public class DingtalkReceiveListener implements EventHandler, InitializingBean { @Value("${spring.application.name}") private String applicationName; @@ -35,28 +35,38 @@ public class DingtalkReceiveListener implements EventHandler, InitializingBean { @Override public void onEvent(Event event, EventConsumer.Context context) { - log.info("receive dingding message: {}", event.getTargetId()); - if (!Objects.equals(applicationName, event.getTargetType())) { - return; - } - DingtalkReceiveMqModel data = event.normalizedData(DingtalkReceiveMqModel.class); - if (log.isDebugEnabled()) { - log.debug("message data: {}", JSON.toJSONString(data)); - } - - DingtalkSendMqModel sendModel = new DingtalkSendMqModel<>(); - sendModel.setTraceId(data.getTraceId()); - sendModel.setConversationId(data.getConversationId()); - sendModel.setMsgId(data.getMsgId()); - sendModel.setRobotCode(data.getRobotCode()); - sendModel.setMessage(SampleText.from("由 WorkflowEngine 处理的消息: " + data.getContent())); - - dingtalkSendProducer.send(sendModel); } @Override public void afterPropertiesSet() throws Exception { - eventConsumer.registerHandler(DingtalkEventEnum.receive.getEventCode(), this); + } + +// @Override +// public void onEvent(Event event, EventConsumer.Context context) { +// log.info("receive dingding message: {}", event.getTargetId()); +// +// if (!Objects.equals(applicationName, event.getTargetType())) { +// return; +// } +// DingtalkReceiveMqModel data = event.normalizedData(DingtalkReceiveMqModel.class); +// if (log.isDebugEnabled()) { +// log.debug("message data: {}", JSON.toJSONString(data)); +// } +// +// DingtalkSendMqModel sendModel = new DingtalkSendMqModel<>(); +// sendModel.setTraceId(data.getTraceId()); +// sendModel.setConversationId(data.getConversationId()); +// sendModel.setMsgId(data.getMsgId()); +// sendModel.setRobotCode(data.getRobotCode()); +// sendModel.setMessage(SampleText.from("由 WorkflowEngine 处理的消息: " + data.getContent())); +// +// dingtalkSendProducer.send(sendModel); +// } + +// @Override +// public void afterPropertiesSet() throws Exception { +// eventConsumer.registerHandler(DingtalkEventEnum.receive.getEventCode(), this); +// } } diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/producer/DingtalkSendProducer.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/producer/DingtalkSendProducer.java index 88831e231..7c1f306b1 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/producer/DingtalkSendProducer.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/producer/DingtalkSendProducer.java @@ -2,8 +2,8 @@ package cn.axzo.workflow.server.outside.mq.producer; import cn.axzo.framework.rocketmq.Event; import cn.axzo.framework.rocketmq.RocketMQEventProducer; -import cn.axzo.riven.client.common.enums.DingtalkEventEnum; -import cn.axzo.riven.client.model.DingtalkSendMqModel; +//import cn.axzo.riven.client.common.enums.DingtalkEventEnum; +//import cn.axzo.riven.client.model.DingtalkSendMqModel; import lombok.extern.slf4j.Slf4j; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Value; @@ -26,14 +26,14 @@ public class DingtalkSendProducer extends RocketMQEventProducer { super(rocketMQTemplate, defaultModule, appName, defaultContext, sendCallback); } - public void send(DingtalkSendMqModel model) { - send(Event.builder() - .shardingKey(applicationName) - .eventCode(DingtalkEventEnum.send.getEventCode()) - .targetId(model.getTraceId()) - .targetType(DingtalkEventEnum.send.getTag()) - .data(model) - .build()); - } +// public void send(DingtalkSendMqModel model) { +// send(Event.builder() +// .shardingKey(applicationName) +// .eventCode(DingtalkEventEnum.send.getEventCode()) +// .targetId(model.getTraceId()) +// .targetType(DingtalkEventEnum.send.getTag()) +// .data(model) +// .build()); +// } }