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 | 64 +++++++++++++------------------
1 files changed, 27 insertions(+), 37 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 78da526..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,9 +1,11 @@
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;
@@ -30,6 +32,7 @@
/**
* 鍥哄寲娴佺▼鏈嶅姟
*/
+@Slf4j
@Service
@AllArgsConstructor
public class CureFlowService {
@@ -40,11 +43,6 @@
private final IdentityService identityService;
- private final NcProgramService ncProgramService;
-
- private final MachineService machineService;
-
- private final ProcessProgRefService processProgRefService;
/**
* 鍥哄寲娴佺▼鐨刱ey
*/
@@ -53,36 +51,32 @@
@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) {
//鏍规嵁鍒嗙粍鍚姩娴佺▼锛屽苟鎻掑叆鍏宠仈琛�
- programs.forEach(this::startOne);
+ programPackageList.forEach(this::startOne);
}
/**
* 鍚姩涓�涓暟鎺х▼搴忕殑鍥哄寲娴佺▼
- * @param prog 鏁版帶绋嬪簭瀹炰綋
+ * @param programPackage 绋嬪簭鍖呭悕 鑺傜偣瀹炰綋
*/
- public void startOne(NcProgram prog){
- Map<String, Object> vars = new HashMap<>();
-
- //NcProgram prog = programs.get(0);
- Machine machine = machineService.getByCode(prog.getMachineCode());
- vars.put("machineCode",prog.getMachineCode());
- vars.put("machineMode",machine.getName());
- vars.put("processEdition",prog.getProcessEdition());
-
+ public void startOne(NcNode programPackage) {
+ Map<String, Object> vars = null;
//璇ョ▼搴忓湪璁″垝浠诲姟鏃� 鑾峰彇缂栧埗锛屾牎瀵癸紝瀹℃壒鐨勪汉鍛橈紝浣滀负榛樿鐢ㄦ埛锛屽叾涓紪鍒舵椂绗竴涓浐瀹氱殑鐢ㄦ埛
- ProcessProgRef preRef = processProgRefService.lastDispatchDataByNcProgramId(prog.getId());
- //鑾峰彇瀹℃壒鐢ㄦ埛
- List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(preRef.getProcessInstanceId())
- .orderByHistoricTaskInstanceEndTime().desc()
- .list();
+ 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;
@@ -100,21 +94,17 @@
senior = task.getAssignee();
}
- }
- vars.put("programmer",programmer);
- vars.put("checker",checker);
- vars.put("senior",senior);
+ }*/
+ //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);
-
- ProcessProgRef ref = new ProcessProgRef();
- ref.setProcessInstanceId(pinst.getId());
- ref.setNcProgramId(prog.getId());
-
- processProgRefService.save(ref);
+ log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", pinst.getId());
+ //杩欓噷闇�瑕佹柊寤轰竴涓悓鍚嶇▼搴忓寘鍚嶏紝鍜屼笅灞炵殑鏂囦欢鍚楋紝涓嶉渶瑕侊紝鍦╠ncSendbackService涓柊寤虹殑锛岃繖閲屼笉澶勭悊
}
--
Gitblit v1.9.3