From 86079d1c2bd7981165487e6e08d2399b80687f6e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 04 九月 2025 14:21:49 +0800
Subject: [PATCH] 工控网导出使用实际编程人匹配
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java | 122 ++++++++++++++++++----------------------
1 files changed, 55 insertions(+), 67 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
index 00a9793..6583647 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java
@@ -1,9 +1,7 @@
package org.springblade.mdm.flow.excution.dispatch;
import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.entity.ApproveRecord;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
@@ -29,8 +27,6 @@
@Autowired
private NcProgramApprovedService approvedService;
@Autowired
- private ApproveRecordService approveRecordService;
- @Autowired
private FlowProgramFileService flowProgramFileService;
@Autowired
private NcNodeService ncNodeService;
@@ -42,81 +38,79 @@
*/
public void handleData(FlowProgramProperties props) {
// 鎵ц涓氬姟閫昏緫
- String instId = props.getProcessInstanceId();
-
- String programPkgName = NcNodeService.genProgramName(props.getDrawingNo(),props.getProcessNo());
- createProgramNodes(props);
-
- //TODO 鍋忕鍗曪紝鍜屽凡缁忓浐鍖栫殑绋嬪簭锛屾病鏈夊鐞�,:宸茬粡澶勭悊娌℃湁楠岃瘉
NcNode packageNode;
if(FlowContants.Y.equals(props.getHasCuredProgram())){
- //鏈夊浐鍖栵紝涓旂▼搴忓彲鐢紝浠庡浐鍖栨爲鏌ヨ鑺傜偣.浣跨敤娴佺▼涓繚瀛樼殑鑺傜偣
- //packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition());
- if(FlowContants.Y.equals(props.getCureProgramUseable())) {
- packageNode = ncNodeService.getById(props.getCuredNodeId());
+ //鏈夊浐鍖�
+ packageNode = ncNodeService.getById(props.getCuredNodeId());
+
+ if(FlowContants.N.equals(props.getCureProgramUseable())) {
+ //绋嬪簭涓嶅彲鐢�
+ //鍘熸潵鐨勫浐鍖栬妭鐐归攣瀹�
+ packageNode.lock();
+ ncNodeService.updateById(packageNode);
+
+ Integer newVersion = packageNode.genNewVersionNumber();
+ packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,newVersion);
}else{
- //涓嶅彲鐢紝鍘诲浐鍖栨壘鏈�鏂拌妭鐐�
- packageNode = ncNodeService.getLastEditionCuredProgramPackage(programPkgName,props.getProcessEdition());
+ //鍙敤锛屽崌鐗堬紙淇敼鍏跺伐搴忕増鏈級锛屽師鏉ョ殑鑺傜偣娓呴櫎
+ moveToNewProcessEdition(packageNode,props);
}
- }else if(Func.isNotBlank(props.getDeviation())){
- //鏈夊亸绂诲崟
- packageNode = ncNodeService.getLastEditionDeviationProgramPackage(programPkgName,props.getProcessEdition());
}else{
- //鏅�氳瘯鍒囷紝鎴栬�呮湁鍥哄寲涓嶅彲鐢�
- packageNode = ncNodeService.getLastEditionTryingProgramPackage(programPkgName,props.getProcessEdition());
+ //鏅�氳瘯鍒�
+ packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,1);
}
addApproveTable(packageNode,props);
- updateApproveRecordNodeId(instId, packageNode.getId());
+ //updateApproveRecordNodeId(instId, packageNode.getId());
log.info("鏅�氭祦绋嬪凡瀹屾垚in DispatchFinishListener");
}
/**
- * 鑷姩鍒涘缓绋嬪簭鑺傜偣
- * @param progProperties 娴佺▼灞炴��
+ * 鑺傜偣绉诲姩鍒版柊鐨勫伐搴忕増鏈笅
+ * @param packageNode 绋嬪簭鍖呭悕鑺傜偣
+ * @param props 娴佺▼灞炴��
*/
- void createProgramNodes(FlowProgramProperties progProperties){
- if(FlowContants.N.equals(progProperties.getHasCuredProgram())) {
- //鏃犲浐鍖�:(璇曞垏鎴栬�呭亸绂�)
- ncNodeAutoCreateService.createNodeTreeWithProgram(progProperties);
- }else{
- //鏈夊浐鍖栵紝绋嬪簭涓嶅彲鐢�
- if(FlowContants.N.equals(progProperties.getCureProgramUseable())) {
- //鍥哄寲绋嬪簭涓嶅彲鐢紝闇�瑕侀噸鏂板缓绔嬬▼搴忓寘鍚嶅拰鏂囦欢鑺傜偣;鍙敤鎯呭喌鍦ㄦ祦绋嬪鎵逛腑宸茬粡鍗囩骇杩囪妭鐐逛簡
- NcNode curedProgramPackage = ncNodeService.getById(progProperties.getCuredNodeId());
+ private void moveToNewProcessEdition(NcNode packageNode, FlowProgramProperties props) {
+ ncNodeService.deleteMachineNodeByParentId(packageNode.getParentId());
- NcNode newCuredPkgNode = new NcNode();
- BeanUtils.copyProperties(curedProgramPackage, newCuredPkgNode);
- EntityUtil.clearBaseProperties(newCuredPkgNode);
- newCuredPkgNode.setIsLastEdition(1);
- newCuredPkgNode.setIsLocked(0);
- newCuredPkgNode.upgradeVersionNumber();
- ncNodeService.save(newCuredPkgNode);
+ FlowProgramProperties tempProps = new FlowProgramProperties();
+ BeanUtils.copyProperties(props,tempProps);
+ tempProps.setProcessDefinitionKey(FlowContants.CURE_PROCESS_KEY);//涓存椂淇敼鍏朵负鍥哄寲,鍦ㄥ浐鍖栦笅鍒涘缓鑺傜偣
+ NcNode machineNode = ncNodeAutoCreateService.createNodeTreeToMachine(tempProps);
- //鏂扮殑娴佺▼瀵瑰簲鐨勬枃浠舵洿鏂板埌鏂拌妭鐐逛笅
- List<FlowProgramFile> newFlowFileList = flowProgramFileService.listByProcessInstanceId(progProperties.getProcessInstanceId());
- for (FlowProgramFile newFlowFile : newFlowFileList) {
- NcNode newProgramNode = new NcNode();
- BeanUtils.copyProperties(newCuredPkgNode, newProgramNode);
- EntityUtil.clearBaseProperties(newProgramNode);
+ //绉诲姩鍘嗗彶鑺傜偣鍒版柊鐨勭増娆¤妭鐐逛笅
+ List<NcNode> packageHisNodes = ncNodeService.getNodeHistory(packageNode);//璇ュ寘鐨勫巻鍙茶妭鐐瑰垪琛�
+ for(NcNode hisPackageNode : packageHisNodes){
+ hisPackageNode.setParentId(machineNode.getParentId());
+ hisPackageNode.setParentIds(machineNode.getParentIds());
- newProgramNode.setName(newFlowFile.getName());
- newProgramNode.setNodeType(NcNode.TYPE_PROGRAM_FILE);
- newProgramNode.setParentId(newCuredPkgNode.getId());
- newProgramNode.setIsLastEdition(1);
- newProgramNode.setIsLocked(0);
- newProgramNode.setParentIds(newCuredPkgNode.getParentIds() + "," + newCuredPkgNode.getId());
- newProgramNode.setFlowProgramFileId(newFlowFile.getId());
- ncNodeService.save(newProgramNode);
- }
+ List<NcNode> oriProgramNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId,hisPackageNode.getId()).list();
- //鍘熻妭鐐规洿鏂颁负鑰佺増鏈紝閿佸畾
- curedProgramPackage.setIsLastEdition(0);
- curedProgramPackage.setIsLocked(1);
- ncNodeService.updateById(curedProgramPackage);
+ for(NcNode oldProgramNode : oriProgramNodes){
+ oldProgramNode.setParentIds(hisPackageNode.getParentIds()+","+hisPackageNode.getId());
}
+ ncNodeService.updateBatchById(oriProgramNodes);
}
+ ncNodeService.updateBatchById(packageHisNodes);
+
+ //绉诲姩绋嬪簭鍖呭悕鑺傜偣
+ packageNode.setProcessEdition(tempProps.getProcessEdition());
+ packageNode.setParentId(machineNode.getParentId());
+ packageNode.setParentIds(machineNode.getParentIds());
+ this.ncNodeService.updateById(packageNode);
+
+ //绉诲姩绋嬪簭鑺傜偣
+ List<NcNode> programNodes = ncNodeService.getProgramFilesByPackageId(packageNode.getId());
+ for(NcNode programNode : programNodes){
+ programNode.setParentIds(packageNode.getParentIds()+","+packageNode.getId());
+ programNode.setProcessEdition(tempProps.getProcessEdition());//淇敼宸ュ簭鐗堟
+ programNode.setVersionNumber(packageNode.getVersionNumber());
+ }
+ ncNodeService.updateBatchById(programNodes);
+
+
}
+
/**
* 淇濆瓨瀹℃壒瀹屾垚鐨勮褰�
@@ -129,16 +123,10 @@
approved.setProgramName(packageNode.getName());
approved.setNcNodeId(packageNode.getId());//绋嬪簭鍖呰妭鐐筰d
approved.setTitle(props.getTitle());
- approved.setProgrammerId(props.getProgrammerId());
+ approved.setProgrammerId(props.getActProgrammerId());
+ approved.setProcessInstanceId(props.getProcessInstanceId());
approvedService.save(approved);
}
-
- void updateApproveRecordNodeId(String processInstanceId,Long nodeId){
- //鏇存柊瀹℃壒璁板綍鐨刵cNodeId
- approveRecordService.lambdaUpdate()
- .eq(ApproveRecord::getProcessInstanceId, processInstanceId)
- .set(ApproveRecord::getNcNodeId,nodeId).update();
- }
}
--
Gitblit v1.9.3