From 5173c99276023cac788875d5fa8d5cad84112777 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 00:36:00 +0800
Subject: [PATCH] dnc导入导出格式修改

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java |  107 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 79 insertions(+), 28 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 078f02c..ff0e043 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,8 +1,13 @@
 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;
+import org.flowable.engine.history.HistoricProcessInstance;
 import org.flowable.engine.runtime.ProcessInstance;
+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;
@@ -10,61 +15,107 @@
 import org.springblade.mdm.flow.vo.TaskAssignVO;
 import org.springblade.mdm.program.entity.NcNode;
 import org.springblade.mdm.program.entity.NcProgram;
+import org.springblade.mdm.program.entity.ProcessProgRef;
 import org.springblade.mdm.program.service.NcNodeService;
 import org.springblade.mdm.program.service.NcProgramService;
+import org.springblade.mdm.program.service.ProcessProgRefService;
+import org.springblade.mdm.program.vo.DncSendBackData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 鍥哄寲娴佺▼鏈嶅姟
  */
+@Slf4j
 @Service
+@AllArgsConstructor
 public class CureFlowService {
 
-	@Autowired
-	private RuntimeService runtimeService;
-	@Autowired
-	private AutoAssignUsersService autoAssignUsersService;
-	@Autowired
-	private IdentityService identityService;
+	private final RuntimeService runtimeService;
 
-	@Autowired
-	private NcProgramService ncProgramService;
-	@Autowired
-	private NcNodeService ncNodeService;
-	@Autowired
-	private MachineService machineService;
+	private final HistoryService historyService;
+
+	private final IdentityService identityService;
+
 	/**
 	 * 鍥哄寲娴佺▼鐨刱ey
 	 */
 	private static final String PROCESS_KEY = "program-cure";
 
-	/**
-	 * 鍚姩鍥哄寲娴佺▼
-	 * @param programId 绋嬪簭id
-	 */
-	public void start(long programId){
-		Map<String, Object> vars = new HashMap<>();
-		//NcProgram prog = ncProgramService.getById(programId);
-		NcNode progNode = ncNodeService.getById(programId);
-		Machine machine = machineService.getByCode(progNode.getMachineCode());
-		vars.put("machineCode",machine.getCode());
-		vars.put("machineMode",machine.getName());
-		vars.put("processEdition",progNode.getProcessEdition());
-		vars.put("programId",programId);
-		vars.put("program",progNode);
 
+
+	@Transactional
+	public void startCure(List<NcNode> programPackageList) {
+		//鏍规嵁鍒嗙粍鍚姩娴佺▼锛屽苟鎻掑叆鍏宠仈琛�
+		programPackageList.forEach(this::startOne);
+	}
+
+	/**
+	 * 鍚姩涓�涓暟鎺х▼搴忕殑鍥哄寲娴佺▼
+	 * @param programPackage 绋嬪簭鍖呭悕 鑺傜偣瀹炰綋
+	 */
+	public void startOne(NcNode programPackage) {
+		Map<String, Object> vars = null;
+		//璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
+		if(programPackage.getProcessInstanceId() != null) {
+			//鑾峰彇瀹℃壒鐢ㄦ埛
+			HistoricProcessInstance instance = historyService.createHistoricProcessInstanceQuery()
+				.processInstanceId(programPackage.getProcessInstanceId()).includeProcessVariables()
+				.singleResult();
+			if(instance != null) {//浣跨敤浠诲姟娲惧伐娴佺▼鐨勫彉閲�
+				vars = new HashMap<>(instance.getProcessVariables());
+			}
+
+		}
+		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();
+			}
+
+		}*/
+		//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);
+		log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", pinst.getId());
+		//杩欓噷闇�瑕佹柊寤轰竴涓悓鍚嶇▼搴忓寘鍚嶏紝鍜屼笅灞炵殑鏂囦欢鍚楋紝涓嶉渶瑕侊紝鍦╠ncSendbackService涓柊寤虹殑锛岃繖閲屼笉澶勭悊
 
-		int a=1;
-		//log.info()
 	}
 
+	/**
+	 * 灏嗙▼搴忔寜鐓ф満鍣ㄤ唬鐮佸垎缁�
+	 * @param ncProgramIdList
+	 * @return
+	 */
+	/*
+	Map<String,List<NcProgram>> groupProgramsByMachineCode(List<Long> ncProgramIdList){
+		List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
+		return programs.stream().collect(Collectors.groupingBy(NcProgram::getMachineCode));
+	}*/
 }

--
Gitblit v1.9.3