From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 123 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 43 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..6c961df 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,70 +1,107 @@
package org.springblade.mdm.flow.service;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.IdentityService;
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
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.excution.AutoAssignUsersService;
-import org.springblade.mdm.flow.vo.TaskAssignVO;
+import org.springblade.mdm.flow.constants.FlowConstant;
+import org.springblade.mdm.flow.constants.FlowVariableConstant;
+import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.program.entity.NcNode;
-import org.springblade.mdm.program.entity.NcProgram;
import org.springblade.mdm.program.service.NcNodeService;
-import org.springblade.mdm.program.service.NcProgramService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springblade.mdm.utils.EntityUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
* 鍥哄寲娴佺▼鏈嶅姟
*/
+@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;
- /**
- * 鍥哄寲娴佺▼鐨刱ey
- */
- private static final String PROCESS_KEY = "program-cure";
+ private final IdentityService identityService;
+ private final NcNodeService ncNodeService;
+
+ private final FlowProgramFileService flowProgramFileService;
+ private final FlowCommonService flowCommonService;
/**
* 鍚姩鍥哄寲娴佺▼
- * @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);
-
-
- String businessKey = "0";//涓氬姟琛╧ey
-
- identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
- ProcessInstance pinst = runtimeService.startProcessInstanceByKey(PROCESS_KEY,businessKey,vars);
-
- int a=1;
- //log.info()
+ @Transactional
+ public void startCureNew(Map<Long, List<FlowProgramFile>> pkgIdFileMap) {
+ pkgIdFileMap.forEach(this::startOneNew);
}
+ /**
+ * 鍚姩涓�璋冪▼搴忕殑鍥哄寲娴佺▼
+ * @param nodeId
+ * @param fileList
+ */
+ private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
+ Map<String, Object> vars = new HashMap<>();
+ NcNode programPackage = this.ncNodeService.getById(nodeId);
+ vars.put(FlowConstant.NODE_ID,programPackage.getId());
+
+ flowCommonService.putFlowVariablesByNode(vars,programPackage);
+
+ flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
+ vars.put(FlowVariableConstant.ASSIGNEE,vars.get(FlowVariableConstant.PROGRAMMER));
+ identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
+ vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
+
+ if(programPackage.getDeviation() != null) {
+ vars.put(FlowVariableConstant.MY_PROCESS_NAME, "涓存椂鏇存敼鍗曞洖浼�");
+ vars.put(FlowVariableConstant.TITLE,programPackage.getName()+"-涓存椂鏇存敼鍗曞洖浼�");//鑷姩澧炲姞鏍囬
+ }else {
+ vars.put(FlowVariableConstant.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ vars.put(FlowVariableConstant.TITLE,programPackage.getName()+"-"+programPackage.getProcessEdition()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+ }
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowConstant.CURE_PROCESS_KEY,"0",vars);
+
+ //鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
+ programPackage.setProcessInstanceId(inst.getProcessInstanceId());
+ ncNodeService.updateById(programPackage);
+
+ for(FlowProgramFile flowProgramFile : fileList){
+ flowProgramFile.setProcessInstanceId(inst.getProcessInstanceId());
+ }
+ this.flowProgramFileService.saveBatch(fileList);
+
+ addPreviousOtherFiles(programPackage.getId(),inst.getProcessInstanceId());
+
+ log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", inst.getId());
+ }
+
+ /**
+ * 澶嶅埗璇曞垏闃舵鐨勫叾浠栨枃浠剁粰鍥哄寲娴佺▼
+ * @param previousNodeId 璇曞垏闃舵鐨勮妭鐐筰d
+ * @param newProcessInstanceId 鏂扮殑鍥哄寲娴佺▼瀹炰緥id
+ */
+ void addPreviousOtherFiles(Long previousNodeId,String newProcessInstanceId) {
+ List<NcNode> previousFileNodes = ncNodeService.getProgramFilesByPackageId(previousNodeId);
+ for(NcNode fileNode : previousFileNodes){
+
+ FlowProgramFile progFile = flowProgramFileService.getById(fileNode.getFlowProgramFileId());
+ if(!progFile.isProgram()){
+ FlowProgramFile newProgFile = new FlowProgramFile();
+ BeanUtils.copyProperties(progFile,newProgFile);
+ EntityUtil.clearBaseProperties(newProgFile);
+ newProgFile.setProcessInstanceId(newProcessInstanceId);
+
+ flowProgramFileService.save(newProgFile);
+ }
+ }
+ }
}
--
Gitblit v1.9.3