From bf0e3f18f65182686735665a7fbc3bdedfe98e1d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 02 九月 2025 19:54:07 +0800
Subject: [PATCH] 增加文件下发记录查询和导出
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 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 fd1b8aa..e8160cb 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
@@ -6,8 +6,6 @@
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.SerializationException;
-import org.apache.commons.lang3.StringUtils;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
@@ -15,31 +13,20 @@
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
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.*;
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.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
@Slf4j
@@ -61,6 +48,7 @@
private final TaskDispatchService taskDispatchService;
private final BatchDispatchService dispatchService;
private final ReplaceFlowCompleteService replaceFlowCompleteService;
+ private final TempFlowCompleteService tempFlowCompleteService;
/**
* 鍙戣捣娲惧伐娴佺▼
*/
@@ -68,21 +56,42 @@
@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);
+ boolean isDuplicate = taskDispatchService.checkIsDuplicate(startVO);
+
+ TaskDispatch dispatch = taskDispatchService.saveTask(startVO,isDuplicate);
+ if(isDuplicate){
+ throw new ServiceException("閲嶅娲惧伐");
+ }
+
+ 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);
+ dispatch.setErrMsg(e.getMessage());
+ taskDispatchService.updateById(dispatch);
+ return R.fail("浠诲姟鍚姩寮傚父:"+e.getMessage());
+ }
}catch(Exception e){
return R.fail(e.getMessage());
}
}
+
AbstractFlowCompleteService getActualService(String processInstanceId){
- ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).singleResult();
+ 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)){
- return tryFlowCompleteService;
+ 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{
@@ -95,7 +104,6 @@
try {
AbstractFlowCompleteService completeService = getActualService(processInstanceId);
completeService.completeTask(taskId, processInstanceId, comment, variables);
-
return R.success("娴佺▼鎻愪氦鎴愬姛");
}catch(Exception e){
--
Gitblit v1.9.3