From b5abbb61b25a38a08aa63823b847617f96fb2eba Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 24 八月 2025 15:42:06 +0800
Subject: [PATCH] send文件夹清除；rec文件夹移动temp
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 50 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 38 insertions(+), 12 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
index 6cb0fc4..1deafdc 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java
@@ -21,20 +21,19 @@
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.ApproveRecord;
+import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.TaskDispatchService;
-import org.springblade.mdm.flow.service.execute.AbstractFlowCompleteService;
-import org.springblade.mdm.flow.service.execute.BatchDispatchService;
-import org.springblade.mdm.flow.service.execute.DefaultFlowCompleteService;
-import org.springblade.mdm.flow.service.execute.TryFlowCompleteService;
+import org.springblade.mdm.flow.service.execute.*;
import org.springblade.mdm.flow.vo.BatchDispatchVO;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.ProcessProgRef;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.ProcessProgRefService;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -42,6 +41,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,7 +63,8 @@
private final DefaultFlowCompleteService defaultFlowCompleteService;
private final TaskDispatchService taskDispatchService;
private final BatchDispatchService dispatchService;
-
+ private final ReplaceFlowCompleteService replaceFlowCompleteService;
+ private final TempFlowCompleteService tempFlowCompleteService;
/**
* 鍙戣捣娲惧伐娴佺▼
*/
@@ -71,20 +72,45 @@
@Operation(summary = "浠诲姟璁″垝(娲惧伐娴佺▼)", description = "鍚姩娲惧伐娴佺▼")
public R<Boolean> start(@RequestBody TaskAssignVO startVO) {
try {
- long id= taskDispatchService.saveTask(startVO);
- String instId = dispatcher.start(startVO);
- taskDispatchService.updateSuccess(id,instId);
- return R.data(true);
+ TaskDispatch dispatch = taskDispatchService.saveTask(startVO);
+ boolean isDup = taskDispatchService.checkIsDuplicate(startVO);
+ if (isDup) {
+ dispatch.setStatus(TaskDispatch.STATUS_DUP);
+ taskDispatchService.updateById(dispatch);
+ return R.fail("閲嶅娲惧伐");
+ }else {
+ try {
+ String instId = dispatcher.start(startVO);
+ dispatch.setStatus(TaskDispatch.STATUS_STARTED);
+ dispatch.setProcessInstanceId(instId);
+ taskDispatchService.updateById(dispatch);
+ return R.data(true);
+ }catch (Exception e) {
+ dispatch.setStatus(TaskDispatch.STATUS_EXCEPTION);
+ taskDispatchService.updateById(dispatch);
+ return R.fail("浠诲姟鍚姩寮傚父");
+ }
+ }
+
}catch(Exception e){
return R.fail(e.getMessage());
}
}
+
AbstractFlowCompleteService getActualService(String processInstanceId){
- ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
- if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
- return tryFlowCompleteService;
+ ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).includeProcessVariables().singleResult();
+ if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY) || inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)
+ || inst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
+ String isTempFlow = Func.toStr(inst.getProcessVariables().get(FlowContants.IS_TEMP_FLOW));
+ if(FlowContants.N.equals(isTempFlow)){
+ return tryFlowCompleteService;
+ }else{
+ return tempFlowCompleteService;
+ }
+ }else if(inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
+ return replaceFlowCompleteService;
}else{
return defaultFlowCompleteService;
}
--
Gitblit v1.9.3