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

feat(REQ-3114) - 异常一些异常合并

Browse Source
This commit is contained in:
wangli 2024-10-30 16:50:51 +08:00
parent 8f47e90d77
commit f1e17d6eb4
2 changed files with 44 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/consumer/DingtalkReceiveListener.java
View File

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

22
workflow-engine-server/src/main/java/cn/axzo/workflow/server/outside/mq/producer/DingtalkSendProducer.java
View File

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