From 44b55dd34d09090fe6fdeb7d2428efe9e775424c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 22:54:14 +0800
Subject: [PATCH] 增加流程文件下载接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
index 9a3684c..ae9b820 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java
@@ -5,12 +5,15 @@
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
+import org.flowable.engine.TaskService;
import org.flowable.engine.history.HistoricProcessInstance;
import org.flowable.engine.runtime.ProcessInstance;
+import org.flowable.task.api.Task;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.mdm.basesetting.machine.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
+import org.springblade.mdm.flow.constants.FlowContants;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
@@ -41,22 +44,15 @@
private final RuntimeService runtimeService;
private final HistoryService historyService;
-
+ private final TaskService taskService;
private final IdentityService identityService;
private final NcNodeService ncNodeService;
private final FlowProgramFileService flowProgramFileService;
- /**
- * 鍥哄寲娴佺▼鐨刱ey
- */
- private static final String PROCESS_KEY = "program-cure";
-
-
-
@Transactional
- public void startCure(List<NcNode> programPackageList, Map<Long,List<FlowProgramFile>> allFlowProgramFiles) {
+ public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFiles) {
//鏍规嵁鍒嗙粍鍚姩娴佺▼锛屽苟鎻掑叆鍏宠仈琛�
programPackageList.forEach(pkg -> {
this.startOne(pkg,allFlowProgramFiles.get(pkg.getId()));
@@ -67,8 +63,8 @@
* 鍚姩涓�涓暟鎺х▼搴忕殑鍥哄寲娴佺▼
* @param programPackage 绋嬪簭鍖呭悕 鑺傜偣瀹炰綋
*/
- public void startOne(NcNode programPackage,List<FlowProgramFile> flowProgramFiles) {
- Map<String, Object> vars = null;
+ public void startOne(NcNode programPackage,List<NcNode> programNodes) {
+ Map<String, Object> vars = new HashMap<>();
//璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
if(programPackage.getProcessInstanceId() != null) {
//鑾峰彇瀹℃壒鐢ㄦ埛
@@ -76,13 +72,21 @@
.processInstanceId(programPackage.getProcessInstanceId()).includeProcessVariables()
.singleResult();
if(instance != null) {//浣跨敤浠诲姟娲惧伐娴佺▼鐨勫彉閲�
- vars = new HashMap<>(instance.getProcessVariables());
- vars.remove("proessInstanceId");
+ Map<String, Object> oldVars = instance.getProcessVariables();
+ //鏈哄簥缂栧彿
+ vars.put(FlowContants.MACHINE_CODE,oldVars.get(FlowContants.MACHINE_CODE));
+ //鏈哄簥鍨嬪彿
+ vars.put(FlowContants.MACHINE_MODE,oldVars.get(FlowContants.MACHINE_MODE));
+ vars.put(FlowContants.PROCESS_NO,oldVars.get(FlowContants.PROCESS_NO));
+ vars.put(FlowContants.PROCESS_NAME,oldVars.get(FlowContants.PROCESS_NAME));
+ vars.put(FlowContants.PROCESS_EDITION,oldVars.get(FlowContants.PROCESS_EDITION));
+ vars.put(FlowContants.CRAFT_EDITION, oldVars.get(FlowContants.CRAFT_EDITION));
+ vars.put(FlowContants.DRAWING_NO,oldVars.get(FlowContants.DRAWING_NO));
+ vars.put(FlowContants.DRAWING_NO_EDITION,oldVars.get(FlowContants.DRAWING_NO_EDITION));
+
+ vars.put(FlowContants.PRODUCT_MODEL,oldVars.get(FlowContants.PRODUCT_MODEL));
}
- }
- if(vars == null){
- vars = new HashMap<>();
}
//鏌ユ壘鍘嗗彶瀹為檯鐨勫鎵逛汉
@@ -91,19 +95,27 @@
.list();
fillHistoryAssignees(vars, historicTasks);
-
String businessKey = "0";//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance inst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
+
+ vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
+ vars.put(FlowContants.TITLE,programPackage.getName()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,businessKey,vars);
+
//鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
programPackage.setProcessInstanceId(inst.getProcessInstanceId());
ncNodeService.updateById(programPackage);
- //鏇存柊鏂囦欢鐨勬祦绋嬪疄渚媔d锛屽苟鍏ュ簱
- flowProgramFiles.forEach(flowProgramFile -> {
+ //鏇存柊鏂囦欢鐨勬祦绋嬪疄渚媔d锛屽拰 绋嬪簭鑺傜偣鐨勬祦绋嬫枃浠秈d 骞跺叆搴�
+ programNodes.forEach(programNode -> {
+ FlowProgramFile flowProgramFile = programNode.getFlowProgramFile();
flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
this.flowProgramFileService.save(flowProgramFile);
+
+ programNode.setFlowProgramFileId(flowProgramFile.getId());
+ this.ncNodeService.save(programNode);
});
log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", inst.getId());
}
@@ -142,9 +154,10 @@
}
- vars.put("programmer",programmer);
- vars.put("checker",checker);
- vars.put("senior",senior);
+ vars.put(FlowContants.PROGRAMMER,programmer);
+ vars.put(FlowContants.CHECKER,checker);
+ vars.put(FlowContants.SENIOR,senior);
+ vars.put(FlowContants.ASSIGNEE,programmer);
}
/**
* 灏嗙▼搴忔寜鐓ф満鍣ㄤ唬鐮佸垎缁�
--
Gitblit v1.9.3