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

修改：hpc执行完成结果通知

Browse Source
This commit is contained in:
yangyang01000846
2025-12-05 15:05:58 +08:00
parent cfd084c14e
commit cc8214a247
10 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/src/main/java/com/sdm/common/entity/flowable/params/BaseExecuteParams.java
View File

@@ -1,8 +0,0 @@
package com.sdm.common.entity.flowable.params;
import lombok.Data;
@Data
public class BaseExecuteParams {
}

3
flowable/src/main/java/com/sdm/flowable/dto/req/AsyncCallbackRequest.java → common/src/main/java/com/sdm/common/entity/req/flowable/AsyncCallbackRequest.java
View File

@@ -1,6 +1,5 @@
package com.sdm.flowable.dto.req;
package com.sdm.common.entity.req.flowable;
import com.alibaba.fastjson2.JSONObject;
import lombok.Data;
import java.io.Serializable;

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

@@ -1,8 +1,8 @@
package com.sdm.common.feign.impl.flowable;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.flowable.dto.NodeStructureInfo;
import com.sdm.common.entity.flowable.dto.ProcessDefinitionDTO;
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;
@@ -11,10 +11,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
import java.util.HashMap;
import java.util.Map;
@@ -87,4 +83,16 @@ public class FlowableClientFeignClientImpl implements IFlowableFeignClient {
return SdmResponse.failed("查询流程状态以及节点状态失败");
}
}
@Override
public SdmResponse asyncCallback(AsyncCallbackRequest request) {
SdmResponse<ProcessInstanceDetailResponse> response;
try {
flowableFeignClient.asyncCallback(request);
} catch (Exception e) {
log.error("工作流节点完成通知异常", e);
return SdmResponse.failed("工作流节点完成通知异常");
}
return SdmResponse.success();
}
}

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

@@ -1,8 +1,8 @@
package com.sdm.common.feign.inter.flowable;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.flowable.dto.NodeStructureInfo;
import com.sdm.common.entity.flowable.dto.ProcessDefinitionDTO;
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;
@@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
@@ -33,4 +32,8 @@ public interface IFlowableFeignClient {
@GetMapping("/process/getProcessAndNodeDetailByInstanceId")
SdmResponse<ProcessInstanceDetailResponse> getProcessAndNodeDetailByInstanceId(@RequestParam String processDefinitionId,@RequestParam(required = false) String processInstanceId,@RequestParam String runId);
@PostMapping("/process/asyncCallback")
SdmResponse asyncCallback(@RequestBody AsyncCallbackRequest request);
}

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;

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;

11
pbs/src/main/java/com/sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java
View File

@@ -2,6 +2,8 @@ package com.sdm.pbs.schedule.hpc.hander;
import com.alibaba.fastjson2.JSONObject;
import com.sdm.common.common.SdmResponse;
import com.sdm.common.entity.req.flowable.AsyncCallbackRequest;
import com.sdm.common.feign.inter.flowable.IFlowableFeignClient;
import com.sdm.common.log.CoreLogger;
import com.sdm.common.utils.DateUtils;
import com.sdm.common.utils.String2NumberUtil;
@@ -26,6 +28,9 @@ public class FinishedStatusHandler implements JobStatusHandler {
@Autowired
private HpcInstructionService hpcInstructionService;
@Autowired
private IFlowableFeignClient flowableFeignClient;
@Override
public void handle(SimulationJob simJob, HpcJobStatusInfo statusInfo) {
try {
@@ -49,6 +54,12 @@ public class FinishedStatusHandler implements JobStatusHandler {
// 通知成功修改状态
newDbJob.setFileStatus("uploading");
simulationJobService.updateById(newDbJob);
// todo 先直接流程结束
AsyncCallbackRequest asyncCallbackRequest = new AsyncCallbackRequest();
asyncCallbackRequest.setAsyncTaskId(newDbJob.getJobId());
asyncCallbackRequest.setResultJson("finished");
SdmResponse sdmResponse = flowableFeignClient.asyncCallback(asyncCallbackRequest);
CoreLogger.info("flowableFeignClient asyncCallback result:{}", JSONObject.toJSONString(sdmResponse));
} catch (Exception e) {
CoreLogger.error("HpcJobStatus finshed handle error:{},newDbJob:{},statusInfo:{}",e.getMessage(),
JSONObject.toJSONString(simJob),JSONObject.toJSONString(statusInfo));