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

fix:优化流程节点重试接口实体类封装

Browse Source
This commit is contained in:
gulongcheng
2026-01-27 11:42:40 +08:00
parent 991679a7b0
commit da6c419ae0
5 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/src/main/java/com/sdm/common/entity/req/flowable/RetryFailedNodeReq.java Normal file
View File

@@ -0,0 +1,22 @@
package com.sdm.common.entity.req.flowable;
import lombok.Data;
import java.io.Serializable;
/**
* 重试失败节点请求参数
*/
@Data
public class RetryFailedNodeReq implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 流程实例ID
*/
private String processInstanceId;
/**
* 失败节点ID
*/
private String failNodeId;
}

5
common/src/main/java/com/sdm/common/feign/impl/flowable/FlowableClientFeignClientImpl.java
View File

@@ -3,6 +3,7 @@ package com.sdm.common.feign.impl.flowable;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.flowable.dto.ProcessDefinitionDTO;
import com.sdm.common.entity.req.flowable.AsyncCallbackRequest;
import com.sdm.common.entity.req.flowable.RetryFailedNodeReq;
import com.sdm.common.entity.resp.flowable.DeployFlowableResp;
import com.sdm.common.entity.resp.flowable.ProcessInstanceDetailResponse;
import com.sdm.common.entity.resp.flowable.ProcessInstanceResp;
@@ -97,10 +98,10 @@ public class FlowableClientFeignClientImpl implements IFlowableFeignClient {
}
@Override
public SdmResponse retryFailedNode(String processInstanceId, String failNodeId) {
public SdmResponse retryFailedNode(RetryFailedNodeReq req) {
SdmResponse response;
try {
response = flowableFeignClient.retryFailedNode(processInstanceId, failNodeId);
response = flowableFeignClient.retryFailedNode(req);
log.info("重试当前失败节点："+ response);
return response;
} catch (Exception e) {

3
common/src/main/java/com/sdm/common/feign/inter/flowable/IFlowableFeignClient.java
View File

@@ -3,6 +3,7 @@ package com.sdm.common.feign.inter.flowable;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.flowable.dto.ProcessDefinitionDTO;
import com.sdm.common.entity.req.flowable.AsyncCallbackRequest;
import com.sdm.common.entity.req.flowable.RetryFailedNodeReq;
import com.sdm.common.entity.resp.flowable.DeployFlowableResp;
import com.sdm.common.entity.resp.flowable.ProcessInstanceDetailResponse;
import com.sdm.common.entity.resp.flowable.ProcessInstanceResp;
@@ -37,6 +38,6 @@ public interface IFlowableFeignClient {
SdmResponse asyncCallback(@RequestBody AsyncCallbackRequest request);
@PostMapping("/process/retryFailedNode")
SdmResponse retryFailedNode(@RequestParam String processInstanceId, @RequestParam String failNodeId);
SdmResponse retryFailedNode(@RequestBody RetryFailedNodeReq req);
}

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

@@ -6,6 +6,7 @@ import com.sdm.common.common.ThreadLocalContext;
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.req.flowable.RetryFailedNodeReq;
import com.sdm.common.entity.req.project.SimulationLocalJobReq;
import com.sdm.common.entity.resp.flowable.DeployFlowableResp;
import com.sdm.common.entity.resp.flowable.ProcessInstanceDetailResponse;
@@ -244,11 +245,11 @@ public class ProcessController implements IFlowableFeignClient {
* 重试任务,目前只能重试当前失败的节点
*/
@PostMapping("/retryFailedNode")
@StateGuard(type = OperationTypeEnum.RETRY, idParam = "#processInstanceId")
public SdmResponse retryFailedNode(@RequestParam String processInstanceId, @RequestParam String failNodeId) {
log.info("开始重试任务: {}",failNodeId);
@StateGuard(type = OperationTypeEnum.RETRY, idParam = "#req.processInstanceId")
public SdmResponse retryFailedNode(@RequestBody RetryFailedNodeReq req) {
log.info("开始重试任务: {}",req.getFailNodeId());
try {
processService.retryFailedNode(processInstanceId, failNodeId);
processService.retryFailedNode(req.getProcessInstanceId(), req.getFailNodeId());
return SdmResponse.success("重试任务已提交");
} catch (Exception e) {
return SdmResponse.failed("重试失败");

6
project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
View File

@@ -21,6 +21,7 @@ import com.sdm.common.entity.req.data.*;
import com.sdm.common.entity.req.project.EditReportReq;
import com.sdm.common.entity.req.project.ProjecInfoReq;
import com.sdm.common.entity.req.project.SimulationPerformance;
import com.sdm.common.entity.req.flowable.RetryFailedNodeReq;
import com.sdm.common.entity.req.project.SpdmReportReq;
import com.sdm.common.entity.req.system.LaunchApproveReq;
import com.sdm.common.entity.req.system.UserQueryReq;
@@ -2014,7 +2015,10 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
@Override
public SdmResponse retryFailedNode(String processInstanceId, String failNodeId) {
return flowableFeignClient.retryFailedNode(processInstanceId, failNodeId);
RetryFailedNodeReq req = new RetryFailedNodeReq();
req.setProcessInstanceId(processInstanceId);
req.setFailNodeId(failNodeId);
return flowableFeignClient.retryFailedNode(req);
}
@Override