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 | 85 +++++++++++++++++-------------------------
1 files changed, 34 insertions(+), 51 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 ba90311..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
@@ -6,15 +6,13 @@
import org.flowable.engine.RuntimeService;
import org.flowable.engine.runtime.ProcessInstance;
import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.service.MachineService;
-import org.springblade.mdm.basesetting.machine.entity.Machine;
-import org.springblade.mdm.basesetting.producedivision.service.ProduceDivisionService;
-import org.springblade.mdm.flow.constants.FlowContants;
+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.service.NcNodeService;
-import org.springblade.mdm.program.service.NodeDeptQueryService;
+import org.springblade.mdm.utils.EntityUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,12 +31,9 @@
private final RuntimeService runtimeService;
private final IdentityService identityService;
- private final NodeDeptQueryService nodeDeptQueryService;
private final NcNodeService ncNodeService;
private final FlowProgramFileService flowProgramFileService;
- private final ProduceDivisionService produceDivisionService;
- private final MachineService machineService;
private final FlowCommonService flowCommonService;
/**
@@ -57,48 +52,23 @@
private void startOneNew(Long nodeId, List<FlowProgramFile> fileList) {
Map<String, Object> vars = new HashMap<>();
NcNode programPackage = this.ncNodeService.getById(nodeId);
- vars.put(FlowContants.NODE_ID,programPackage.getId());
- vars.put(FlowContants.MACHINE_CODE,programPackage.getMachineCode());
+ vars.put(FlowConstant.NODE_ID,programPackage.getId());
- //鏈哄簥鍨嬪彿
- Machine machine = machineService.getByCode(programPackage.getMachineCode());
- if(machine != null) {
- vars.put(FlowContants.MACHINE_MODE,machine.getName());
- }
-
- String workshop = nodeDeptQueryService.getWorkshopNameByMachineCode(programPackage.getMachineCode());
- vars.put(FlowContants.WORKSHOP,workshop);
-
- vars.put(FlowContants.NODE_ID, Func.toStr(nodeId));
- vars.put(FlowContants.PROCESS_NO,programPackage.getProcessNo());
- vars.put(FlowContants.PROCESS_NAME,programPackage.getProcessName());
- vars.put(FlowContants.PROCESS_EDITION,programPackage.getProcessEdition());
- vars.put(FlowContants.CRAFT_EDITION, programPackage.getCraftEdition());
- vars.put(FlowContants.DRAWING_NO,programPackage.getDrawingNo());
- vars.put(FlowContants.DRAWING_NO_EDITION,programPackage.getDrawingNoEdition());
-
- vars.put(FlowContants.PRODUCT_MODEL,programPackage.getProductModel());
-
- vars.put(FlowContants.PROGRAM_PACKAGE_NAME,programPackage.getName());
+ flowCommonService.putFlowVariablesByNode(vars,programPackage);
flowCommonService.putDefaultAssignees(vars,programPackage.getDrawingNo(),null);
- //ProduceDivision div = produceDivisionService.getByDrawingNoWithQinzhe(programPackage.getDrawingNo());
- vars.put(FlowContants.ASSIGNEE,vars.get(FlowContants.PROGRAMMER));
-
-
+ vars.put(FlowVariableConstant.ASSIGNEE,vars.get(FlowVariableConstant.PROGRAMMER));
identityService.setAuthenticatedUserId(String.valueOf(AuthUtil.getUserId()));//璁剧疆娴佺▼鍙戣捣浜�
-
- vars.put(FlowContants.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
-
+ vars.put(FlowVariableConstant.LAST_STEP_USER_NICKNAME, AuthUtil.getNickName());
if(programPackage.getDeviation() != null) {
- vars.put(FlowContants.MY_PROCESS_NAME, "鍋忕鍥炰紶");
- vars.put(FlowContants.TITLE,programPackage.getName()+"-鍋忕鍥炰紶");//鑷姩澧炲姞鏍囬
+ vars.put(FlowVariableConstant.MY_PROCESS_NAME, "涓存椂鏇存敼鍗曞洖浼�");
+ vars.put(FlowVariableConstant.TITLE,programPackage.getName()+"-涓存椂鏇存敼鍗曞洖浼�");//鑷姩澧炲姞鏍囬
}else {
- vars.put(FlowContants.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
- vars.put(FlowContants.TITLE,programPackage.getName()+"-"+programPackage.getProcessEdition()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
+ vars.put(FlowVariableConstant.MY_PROCESS_NAME, "鍥哄寲娴佺▼");
+ vars.put(FlowVariableConstant.TITLE,programPackage.getName()+"-"+programPackage.getProcessEdition()+"-鍥哄寲");//鑷姩澧炲姞鏍囬
}
- ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowContants.CURE_PROCESS_KEY,"0",vars);
+ ProcessInstance inst = runtimeService.startProcessInstanceByKey(FlowConstant.CURE_PROCESS_KEY,"0",vars);
//鏇存柊绋嬪簭鍖呭悕鑺傜偣鐨勬祦绋嬪疄渚媔d
programPackage.setProcessInstanceId(inst.getProcessInstanceId());
@@ -109,16 +79,29 @@
}
this.flowProgramFileService.saveBatch(fileList);
+ addPreviousOtherFiles(programPackage.getId(),inst.getProcessInstanceId());
+
log.info("鍚姩鍥哄寲娴佺▼瀹屾垚锛屽疄渚媔d={}", inst.getId());
}
+
/**
- * 灏嗙▼搴忔寜鐓ф満鍣ㄤ唬鐮佸垎缁�
- * @param ncProgramIdList
- * @return
+ * 澶嶅埗璇曞垏闃舵鐨勫叾浠栨枃浠剁粰鍥哄寲娴佺▼
+ * @param previousNodeId 璇曞垏闃舵鐨勮妭鐐筰d
+ * @param newProcessInstanceId 鏂扮殑鍥哄寲娴佺▼瀹炰緥id
*/
- /*
- Map<String,List<NcProgram>> groupProgramsByMachineCode(List<Long> ncProgramIdList){
- List<NcProgram> programs = ncProgramService.listByIds(ncProgramIdList);
- return programs.stream().collect(Collectors.groupingBy(NcProgram::getMachineCode));
- }*/
+ 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