toolchaintechnologycenter/spdm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gulongcheng
2025-12-05 15:15:44 +08:00
parent 8c61f1929a e78c5e9fa3
commit 73a65215e8
12 changed files with 110 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java
View File

@@ -4,12 +4,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.flowable.dto.ProcessDefinitionDTO;
import com.sdm.common.entity.flowable.executeConfig.HPCExecuteConfig;
import com.sdm.common.entity.req.flowable.AsyncCallbackRequest;
import com.sdm.common.entity.resp.flowable.DeployFlowableResp;
import com.sdm.common.entity.resp.flowable.ProcessInstanceDetailResponse;
import com.sdm.common.entity.resp.flowable.ProcessInstanceResp;
import com.sdm.common.feign.inter.flowable.IFlowableFeignClient;
import com.sdm.flowable.delegate.handler.HpcHandler;
import com.sdm.flowable.dto.req.AsyncCallbackRequest;
import com.sdm.flowable.dto.req.CompleteTaskReq;
import com.sdm.flowable.dto.req.RetryRequest;
import com.sdm.flowable.process.ProcessService;
@@ -166,9 +166,10 @@ public class ProcessController implements IFlowableFeignClient {
* @param request 包含异步任务ID和执行结果的请求对象
*/
@PostMapping("/asyncCallback")
public void asyncCallback(@RequestBody AsyncCallbackRequest request) {
public SdmResponse asyncCallback(@RequestBody AsyncCallbackRequest request) {
// 发送信号唤醒流程实例中等待的节点
processService.asyncCallback(request);
return SdmResponse.success();
}
/**

3
flowable/src/main/java/com/sdm/flowable/delegate/UniversalDelegate.java
View File

@@ -1,15 +1,14 @@
package com.sdm.flowable.delegate;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.flowable.executeConfig.BaseExecuteConfig;
import com.sdm.common.entity.req.data.GetFileBaseInfoReq;
import com.sdm.common.entity.req.flowable.AsyncCallbackRequest;
import com.sdm.common.entity.resp.data.FileMetadataInfoResp;
import com.sdm.common.feign.inter.data.IDataFeignClient;
import com.sdm.flowable.constants.FlowableConfig;
import com.sdm.flowable.delegate.handler.ExecutionHandler;
import com.sdm.flowable.dto.req.AsyncCallbackRequest;
import com.sdm.flowable.service.IAsyncTaskRecordService;
import com.sdm.flowable.service.IProcessNodeParamService;
import com.sdm.flowable.util.FlowNodeIdUtils;

24
flowable/src/main/java/com/sdm/flowable/dto/req/AsyncCallbackRequest.java
View File

@@ -1,24 +0,0 @@
package com.sdm.flowable.dto.req;
import com.alibaba.fastjson2.JSONObject;
import lombok.Data;
import java.io.Serializable;
/**
* 异步任务回调请求参数
*/
@Data
public class AsyncCallbackRequest implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 异步任务ID
*/
private String asyncTaskId;
/**
* 任务执行结果数据
*/
private String resultJson;
}

14
flowable/src/main/java/com/sdm/flowable/process/ProcessService.java
View File

@@ -1,18 +1,18 @@
package com.sdm.flowable.process;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.flowable.dto.NodeDetailInfo;
import com.sdm.common.entity.flowable.dto.ProcessDefinitionDTO;
import com.sdm.common.entity.flowable.dto.ProcessInstanceInfo;
import com.sdm.common.entity.req.flowable.AsyncCallbackRequest;
import com.sdm.common.entity.resp.flowable.DeployFlowableResp;
import com.sdm.common.entity.resp.flowable.ProcessInstanceDetailResponse;
import com.sdm.flowable.constants.FlowableConfig;
import com.sdm.flowable.delegate.UniversalDelegate;
import com.sdm.common.entity.flowable.dto.NodeDetailInfo;
import com.sdm.common.entity.flowable.dto.ProcessInstanceInfo;
import com.sdm.common.entity.flowable.dto.ProcessDefinitionDTO;
import com.sdm.flowable.dto.req.AsyncCallbackRequest;
import com.sdm.common.entity.resp.flowable.ProcessInstanceDetailResponse;
import com.sdm.common.entity.resp.flowable.DeployFlowableResp;
import com.sdm.flowable.dto.req.CompleteTaskReq;
import com.sdm.flowable.enums.FlowElementTypeEnums;
import com.sdm.flowable.service.IProcessNodeParamService;
import com.sdm.flowable.util.Dto2BpmnConverter;
import com.sdm.flowable.dto.req.CompleteTaskReq;
import com.sdm.flowable.util.FlowNodeIdUtils;
import lombok.extern.slf4j.Slf4j;
import org.flowable.bpmn.model.*;

2
flowable/src/main/java/com/sdm/flowable/service/IAsyncTaskRecordService.java
View File

@@ -1,7 +1,7 @@
package com.sdm.flowable.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.sdm.flowable.dto.req.AsyncCallbackRequest;
import com.sdm.common.entity.req.flowable.AsyncCallbackRequest;
import com.sdm.flowable.entity.AsyncTaskRecord;
import org.flowable.engine.delegate.DelegateExecution;

2
flowable/src/main/java/com/sdm/flowable/service/impl/AsyncTaskRecordServiceImpl.java
View File

@@ -2,8 +2,8 @@ package com.sdm.flowable.service.impl;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.sdm.common.entity.req.flowable.AsyncCallbackRequest;
import com.sdm.flowable.dao.AsyncTaskRecordMapper;
import com.sdm.flowable.dto.req.AsyncCallbackRequest;
import com.sdm.flowable.entity.AsyncTaskRecord;
import com.sdm.flowable.service.IAsyncTaskRecordService;
import org.flowable.engine.RuntimeService;