From a3048fa6fa72fa3cc5da2c43c59bd000e00c9599 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 18 九月 2025 23:13:32 +0800
Subject: [PATCH] 工控网分析程序状态问题修复
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/controller/DispatchController.java | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 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 1309f3f..2dee5b9 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,17 +6,15 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.RuntimeService;
-import org.flowable.engine.TaskService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.tool.api.IResultCode;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.constants.FlowVariableContants;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.excution.StartDispatcher;
-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;
@@ -108,17 +106,17 @@
*/
AbstractFlowCompleteService getActualService(String processInstanceId){
ProcessInstance inst = runtimeService.createProcessInstanceQuery().processInstanceId(processInstanceId).includeProcessVariables().singleResult();
- if(inst.getProcessDefinitionKey().equals(FlowContants.TRY_PROCESS_KEY)
- || inst.getProcessDefinitionKey().equals(FlowContants.UNLOCK_PROCESS_KEY)){
- String isTempFlow = Func.toStr(inst.getProcessVariables().get(FlowVariableContants.IS_TEMP_FLOW));
- if(FlowContants.N.equals(isTempFlow)){
+ if(inst.getProcessDefinitionKey().equals(FlowConstant.TRY_PROCESS_KEY)
+ || inst.getProcessDefinitionKey().equals(FlowConstant.UNLOCK_PROCESS_KEY)){
+ String isTempFlow = Func.toStr(inst.getProcessVariables().get(FlowVariableConstant.IS_TEMP_FLOW));
+ if(FlowConstant.N.equals(isTempFlow)){
return tryFlowCompleteService;
}else{
return tempFlowCompleteService;
}
- }else if(inst.getProcessDefinitionKey().equals(FlowContants.CURE_PROCESS_KEY)){
+ }else if(inst.getProcessDefinitionKey().equals(FlowConstant.CURE_PROCESS_KEY)){
return cureFlowCompleteService;
- }else if(inst.getProcessDefinitionKey().equals(FlowContants.REPLACE_PROCESS_KEY)){
+ }else if(inst.getProcessDefinitionKey().equals(FlowConstant.REPLACE_PROCESS_KEY)){
return replaceFlowCompleteService;
}else{
return defaultFlowCompleteService;
@@ -172,16 +170,18 @@
}catch(Exception e){
return R.fail(e.getMessage());
}
+ }
+
+ @Operation(summary = "缂栫▼鍛樼幇鍦虹紪鍒舵壒閲忓鐞�", description = "缂栫▼鍛樼幇鍦虹紪鍒舵壒閲忓鐞�")
+ @PostMapping("batch-program-on-machine")
+ public R<Void> batchProgramOnMachine(@RequestBody BatchDispatchVO batchDispatchVO) {
+ try {
+ dispatchService.batchProgramOnMachine(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,operateResult,comment);
-
- }*/
}
--
Gitblit v1.9.3