From ddafa0375398053baaafdee8612f68c1b75ff7cb Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 13:37:54 +0800
Subject: [PATCH] 机床导入1
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 131 ++++++++++++++++++++++++++++---------------
1 files changed, 86 insertions(+), 45 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 090b3b1..5382be2 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,10 +6,13 @@
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;
import org.flowable.task.api.Task;
+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;
@@ -22,8 +25,12 @@
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;
@@ -32,6 +39,7 @@
import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -46,74 +54,107 @@
private final TaskService taskService;
private final RuntimeService runtimeService;
- private final ProcessProgRefService processProgRefService;
-
- private final ApproveRecordService approveRecordService;
- private final FlowCommonService flowCommonService;
-
private final FlowProgramFileService flowProgramFileService;
+
+
+ private final TryFlowCompleteService tryFlowCompleteService;
+ private final DefaultFlowCompleteService defaultFlowCompleteService;
+ private final TaskDispatchService taskDispatchService;
+ private final BatchDispatchService dispatchService;
+ private final ReplaceFlowCompleteService replaceFlowCompleteService;
+ private final TempFlowCompleteService tempFlowCompleteService;
/**
* 鍙戣捣娲惧伐娴佺▼
*/
@PostMapping("/start")
@Operation(summary = "浠诲姟璁″垝(娲惧伐娴佺▼)", description = "鍚姩娲惧伐娴佺▼")
public R<Boolean> start(@RequestBody TaskAssignVO startVO) {
- dispatcher.start(startVO);
- return R.status(true);
+ try {
+ long id= taskDispatchService.saveTask(startVO);
+ String instId = dispatcher.start(startVO);
+ taskDispatchService.updateSuccess(id,instId);
+ return R.data(true);
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
}
+ AbstractFlowCompleteService getActualService(String processInstanceId){
+ 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;
+ }
+ }
@Operation(summary = "瀹屾垚浠诲姟", description = "娴佸悜涓嬩竴涓妭鐐�")
@PostMapping("completeTask")
public R<Void> completeTask(String taskId, String processInstanceId, String comment,@Parameter(name = "variables", description = "浠诲姟鍙橀噺") @RequestBody Map<String, Object> variables) {
+ try {
+ AbstractFlowCompleteService completeService = getActualService(processInstanceId);
+ completeService.completeTask(taskId, processInstanceId, comment, variables);
- Task task = taskService.createTaskQuery()
- .taskId(taskId)
- .singleResult();
- if(task.getTaskDefinitionKey().equals("programmingTask")) {//缂栧埗鑺傜偣
- String operateResult = variables.get("approve")+"";
- flowProgramFileService.checkProgramFiles(processInstanceId,"Y".equals(operateResult));
- }
- // 澧炲姞璇勮
- if (StringUtil.isNoneBlank(processInstanceId, comment)) {
- taskService.addComment(taskId, processInstanceId, comment);
- }
- // 闈炵┖鍒ゆ柇
- if (Func.isEmpty(variables)) {
- variables = Kv.create();
- }
- String programIds = null;
- if(variables.containsKey(FlowContants.PROGRAM_IDS_KEY)){
- programIds = variables.get("programIds").toString();
- runtimeService.setVariable(taskId, FlowContants.PROGRAM_IDS_KEY, programIds);
- }
- if(StringUtils.isNotEmpty(programIds)) {
- //杩欏凡缁忔病鐢ㄤ簡锛岀洿鎺ヤ娇鐢ㄤ复鏃舵枃浠�
- processProgRefService.addRelations(processInstanceId,Func.toLongList(programIds));
- }
-
- //鍔犲叆瀹℃壒鐢ㄦ埛
- variables.put("approveUserNickName",AuthUtil.getNickName());
-
- if(variables.containsKey("assignee")){
- addApproveRecord(taskId,processInstanceId,comment,variables);
- //鎸囧畾浜嗕笅涓�姝ユ墽琛屼汉
- taskService.complete(taskId, variables);
return R.success("娴佺▼鎻愪氦鎴愬姛");
- }else {
- // 瀹屾垚浠诲姟,缁欓粯璁ょ敤鎴�
- return R.fail("璇锋寚瀹氭祦绋嬩笅涓�姝ュ鐞嗕汉");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+
+ }
+
+ @Operation(summary = "鎵嬪姩鎵归噺娲惧伐", description = "缁勯暱鎵嬪姩鎵归噺娲惧伐")
+ @PostMapping("batchDispatch")
+ public R<Void> batchDispatch(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchDispatchTask(batchDispatchVO);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
}
}
- void addApproveRecord(String taskId, String processInstanceId, String comment,Map<String, Object> variables){
+ @Operation(summary = "鑷姩鎵归噺娲惧伐", description = "缁勯暱鎵归噺娲惧伐锛屽悗绔嚜鍔ㄦ煡鎵惧鐞嗕汉")
+ @PostMapping("batchDispatchAuto")
+ public R<Void> batchDispatchAuto(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchAutoDispatchTask(batchDispatchVO);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+ }
+
+ @Operation(summary = "鎵归噺瀹℃壒", description = "楂樺笀鎵归噺瀹℃壒")
+ @PostMapping("batchApprove")
+ public R<Void> batchApprove(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchApprove(batchDispatchVO);
+ return R.success("娴佺▼鎻愪氦鎴愬姛");
+ }catch(Exception e){
+ return R.fail(e.getMessage());
+ }
+
+ }
+ /*
+ void addApproveRecord(String taskId,String comment,Map<String, Object> variables){
String operateResult = variables.get("approve")+"";
Task task = taskService.createTaskQuery()
.taskId(taskId)
.singleResult();
- approveRecordService.saveApproveRecords(task,processInstanceId,operateResult,comment);
+ approveRecordService.saveApproveRecords(task,operateResult,comment);
- }
+ }*/
}
--
Gitblit v1.9.3