From 053a438acf9ec33e182b25211ce8108f0367feac Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 06 八月 2025 09:35:58 +0800
Subject: [PATCH] 固化流程，建立node；
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 117 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 71 insertions(+), 46 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 6acabc6..28cf253 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
@@ -1,6 +1,7 @@
package org.springblade.mdm.flow.service;
import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.HistoryService;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
@@ -10,6 +11,7 @@
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.entity.FlowProgramFile;
import org.springblade.mdm.flow.excution.AutoAssignUsersService;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.NcNode;
@@ -31,6 +33,7 @@
/**
* 鍥哄寲娴佺▼鏈嶅姟
*/
+@Slf4j
@Service
@AllArgsConstructor
public class CureFlowService {
@@ -41,11 +44,10 @@
private final IdentityService identityService;
- private final NcProgramService ncProgramService;
+ private final NcNodeService ncNodeService;
- private final MachineService machineService;
+ private final FlowProgramFileService flowProgramFileService;
- private final ProcessProgRefService processProgRefService;
/**
* 鍥哄寲娴佺▼鐨刱ey
*/
@@ -54,78 +56,101 @@
@Transactional
- public void startCure(List<NcProgram> programs) {
- //DncSendBackData sendBackData;
- //List<Long> ncProgramIdList = dataList.stream().map(DncSendBackData::getId).toList();
- //Map<String,List<NcProgram>> groupedProgram = groupProgramsByMachineCode(ncProgramIdList);
- //List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
+ public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFiles) {
//鏍规嵁鍒嗙粍鍚姩娴佺▼锛屽苟鎻掑叆鍏宠仈琛�
- programs.forEach(this::startOne);
+ programPackageList.forEach(pkg -> {
+ this.startOne(pkg,allFlowProgramFiles.get(pkg.getId()));
+ });
}
/**
* 鍚姩涓�涓暟鎺х▼搴忕殑鍥哄寲娴佺▼
- * @param prog 鏁版帶绋嬪簭瀹炰綋
+ * @param programPackage 绋嬪簭鍖呭悕 鑺傜偣瀹炰綋
*/
- public void startOne(NcProgram prog){
-
+ public void startOne(NcNode programPackage,List<NcNode> programNodes) {
Map<String, Object> vars = null;
- //璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
- ProcessProgRef preRef = processProgRefService.lastDispatchDataByNcProgramId(prog.getId());
- if(preRef != null) {
+ //璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
+ if(programPackage.getProcessInstanceId() != null) {
//鑾峰彇瀹℃壒鐢ㄦ埛
- /*
- List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery().includeProcessVariables()
- .processInstanceId(preRef.getProcessInstanceId())
- .orderByHistoricTaskInstanceEndTime().desc()
- .list();*/
HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
- .processInstanceId(preRef.getProcessInstanceId()).includeProcessVariables()
+ .processInstanceId(programPackage.getProcessInstanceId()).includeProcessVariables()
.singleResult();
if(instance != null) {//浣跨敤浠诲姟娲惧伐娴佺▼鐨勫彉閲�
vars = new HashMap<>(instance.getProcessVariables());
+ vars.remove("proessInstanceId");
}
}
if(vars == null){
vars = new HashMap<>();
}
- /*
- String programmer = null;
- String checker = null;
- String senior = null;
- for (HistoricTaskInstance task : historicTasks) {
- // 鑾峰彇浠诲姟鐨勫姙鐞嗕汉
- if(task.getTaskDefinitionKey().equals("programmingTask")){
- //缂栧埗
- programmer = task.getAssignee();
- }else if(task.getTaskDefinitionKey().equals("check")){
- //鏍″
- checker = task.getAssignee();
- }else if(task.getTaskDefinitionKey().equals("senior")){
- //瀹℃牳
- senior = task.getAssignee();
- }
+ //鏌ユ壘鍘嗗彶瀹為檯鐨勫鎵逛汉
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
+ .orderByTaskCreateTime().desc().processInstanceId(programPackage.getProcessInstanceId())
+ .list();
+ fillHistoryAssignees(vars, historicTasks);
- }*/
- //vars.put("programmer",programmer);
- //vars.put("checker",checker);
- //vars.put("senior",senior);
String businessKey = "0";//涓氬姟琛╧ey
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
+ //鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
+ programPackage.setProcessInstanceId(inst.getProcessInstanceId());
+ ncNodeService.updateById(programPackage);
- ProcessProgRef ref = new ProcessProgRef();
- ref.setProcessInstanceId(pinst.getId());
- ref.setNcProgramId(prog.getId());
+ //鏇存柊鏂囦欢鐨勬祦绋嬪疄渚媔d锛屽拰 绋嬪簭鑺傜偣鐨勬祦绋嬫枃浠秈d 骞跺叆搴�
+ programNodes.forEach(programNode -> {
+ FlowProgramFile flowProgramFile = programNode.getFlowProgramFile();
+ flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
+ this.flowProgramFileService.save(flowProgramFile);
- processProgRefService.save(ref);
+ programNode.setFlowProgramFileId(flowProgramFile.getId());
+ this.ncNodeService.save(programNode);
+ });
+ log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", inst.getId());
}
/**
+ * 濉厖鍘嗗彶瀹℃壒浜猴紝浠庤瘯鍒囨祦绋嬩腑鏌ユ壘
+ * @param vars 鎵惧埌瀹℃壒浜哄悗濉厖鐨刴ap
+ * @param historicTasks 鍘嗗彶浠诲姟闆嗗悎
+ */
+ void fillHistoryAssignees(Map<String, Object> vars,List<HistoricTaskInstance> historicTasks){
+ String programmer = null;
+ String checker = null;
+ String senior = null;
+
+ //鎵句笉鍒板伐鑹哄憳锛岄偅涔堟煡璇㈡渶鍚庝竴涓鎵圭殑宸ヨ壓鍛�
+
+ for (HistoricTaskInstance task : historicTasks) {
+ // 鑾峰彇浠诲姟鐨勫姙鐞嗕汉
+ if (task.getTaskDefinitionKey().equals("programmingTask")) {
+ //缂栧埗
+ if (programmer == null) {
+ programmer = task.getAssignee();
+ }
+ } else if (task.getTaskDefinitionKey().equals("check")) {
+ //鏍″
+ if (checker == null) {
+ checker = task.getAssignee();
+ }
+
+ } else if (task.getTaskDefinitionKey().equals("approveTask")) {
+ //瀹℃牳
+ if (senior == null) {
+ senior = task.getAssignee();
+ }
+ }
+
+ }
+
+ vars.put("programmer",programmer);
+ vars.put("checker",checker);
+ vars.put("senior",senior);
+ }
+ /**
* 灏嗙▼搴忔寜鐓ф満鍣ㄤ唬鐮佸垎缁�
* @param ncProgramIdList
* @return
--
Gitblit v1.9.3