Merge remote-tracking branch 'origin/main'

2025-12-05 15:15:44 +08:00
parent 8c61f1929a e78c5e9fa3
commit 73a65215e8
12 changed files with 110 additions and 31 deletions
--- a/common/src/main/java/com/sdm/common/entity/flowable/params/BaseExecuteParams.java
+++ b/common/src/main/java/com/sdm/common/entity/flowable/params/BaseExecuteParams.java
@@ -1,8 +0,0 @@
-package com.sdm.common.entity.flowable.params;
-
-import lombok.Data;
-
-@Data
-public class BaseExecuteParams {
-
-}
--- a/common/src/main/java/com/sdm/common/entity/req/flowable/AsyncCallbackRequest.java
+++ b/common/src/main/java/com/sdm/common/entity/req/flowable/AsyncCallbackRequest.java
@@ -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;
--- a/common/src/main/java/com/sdm/common/feign/impl/flowable/FlowableClientFeignClientImpl.java
+++ b/common/src/main/java/com/sdm/common/feign/impl/flowable/FlowableClientFeignClientImpl.java
@@ -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();
+    }
 }
--- a/common/src/main/java/com/sdm/common/feign/inter/flowable/IFlowableFeignClient.java
+++ b/common/src/main/java/com/sdm/common/feign/inter/flowable/IFlowableFeignClient.java
@@ -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);
+
 }
--- a/data/src/main/java/com/sdm/data/controller/DataFileController.java
+++ b/data/src/main/java/com/sdm/data/controller/DataFileController.java
@@ -19,6 +19,7 @@ import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
@@ -27,6 +28,14 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.util.Comparator;
 import java.util.List;

@RestController
@@ -466,5 +475,60 @@ public class DataFileController implements IDataFeignClient {
        return IDataFileService.onlyOfficeCallback(callbackData);
    }

+    /**
+     * flowable 节点文件回传本地磁盘
+     * @param fileId 绝对路径拼接成成临时碎片目录，filename 文件名称，absoluteFilePath：文件的绝对路径，不带文件名称
+     * @return
+     */
+    @PostMapping ("/flowableUpFileToLocal")
+    public ResponseEntity<String> uploadChunk(
+            @RequestParam String fileId,
+            @RequestParam int chunkIndex,
+            @RequestParam String absoluteFilePath,
+            HttpServletRequest request) throws IOException {
+        // chunk 路径：/data/upload/chunks/{fileId}/{chunkIndex}.part
+        Path normalize = Paths.get(absoluteFilePath).toAbsolutePath().normalize();
+        Path chunkDir = normalize.resolve(fileId).normalize();
+        Files.createDirectories(chunkDir);
+        Path chunkPath = chunkDir.resolve(chunkIndex + ".temp");
+        try (InputStream in = request.getInputStream();
+             OutputStream out = Files.newOutputStream(chunkPath,
+                     StandardOpenOption.CREATE,
+                     StandardOpenOption.WRITE)) {
+            in.transferTo(out);
+        }
+        return ResponseEntity.ok("OK");
+    }
+
+    @PostMapping ("/flowableUpFileToLocalMerge")
+    public ResponseEntity<String> mergeChunks(
+            @RequestParam String fileId,
+            @RequestParam int totalChunks,
+            @RequestParam String absoluteFilePath,
+            @RequestParam String filename) throws IOException {
+        Path targetDir = Paths.get(absoluteFilePath).toAbsolutePath().normalize();
+        Path chunkDir = targetDir.resolve(fileId);
+        Files.createDirectories(targetDir);
+        Path targetFile = targetDir.resolve(filename);
+        try (OutputStream out = Files.newOutputStream(
+                targetFile,
+                StandardOpenOption.CREATE,
+                StandardOpenOption.WRITE)) {
+            for (int i = 0; i < totalChunks; i++) {
+                Path chunk = chunkDir.resolve(i + ".temp");
+                try (InputStream in = Files.newInputStream(chunk)) {
+                    in.transferTo(out);
+                }
+            }
+        }
+        // 合并完删除分片
+        Files.walk(chunkDir)
+                .sorted(Comparator.reverseOrder())
+                .forEach(path -> {
+                    try { Files.delete(path); } catch (Exception ignored) {}
+                });
+
+        return ResponseEntity.ok("SUCCESS:" + targetFile.toString());
+    }

 }
--- a/data/src/main/resources/application-dev.yml
+++ b/data/src/main/resources/application-dev.yml
@@ -120,4 +120,6 @@ minio:
 security:
  whitelist:
    paths:
-      - /data/previewImage
+      - /data/previewImage
+      - /data/flowableUpFileToLocal
+      - /data/flowableUpFileToLocalMerge
--- a/flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java
+++ b/flowable/src/main/java/com/sdm/flowable/controller/ProcessController.java
@@ -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();
    }

    /**
--- a/flowable/src/main/java/com/sdm/flowable/delegate/UniversalDelegate.java
+++ b/flowable/src/main/java/com/sdm/flowable/delegate/UniversalDelegate.java
@@ -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;
--- a/flowable/src/main/java/com/sdm/flowable/process/ProcessService.java
+++ b/flowable/src/main/java/com/sdm/flowable/process/ProcessService.java
@@ -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.*;
--- a/flowable/src/main/java/com/sdm/flowable/service/IAsyncTaskRecordService.java
+++ b/flowable/src/main/java/com/sdm/flowable/service/IAsyncTaskRecordService.java
@@ -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;

--- a/flowable/src/main/java/com/sdm/flowable/service/impl/AsyncTaskRecordServiceImpl.java
+++ b/flowable/src/main/java/com/sdm/flowable/service/impl/AsyncTaskRecordServiceImpl.java
@@ -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;
--- a/pbs/src/main/java/com/sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java
+++ b/pbs/src/main/java/com/sdm/pbs/schedule/hpc/hander/FinishedStatusHandler.java
@@ -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));