From d4ca3871c18474768c924fcbfd6e8d3178040092 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 15 九月 2025 01:19:56 +0800
Subject: [PATCH] 性能优化
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/dispatch/NormalFinishDataHandler.java | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 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 9f867af..890e623 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,21 +1,23 @@
package org.springblade.mdm.flow.excution.dispatch;
+import com.alibaba.excel.util.StringUtils;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
import org.springblade.mdm.flow.constants.FlowContants;
-import org.springblade.mdm.flow.entity.FlowProgramFile;
-import org.springblade.mdm.flow.service.ApproveRecordService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.flow.service.FlowProgramProperties;
+import org.springblade.mdm.gkw.programnode.vo.ProgramNameVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgramApproved;
import org.springblade.mdm.program.service.NcNodeAutoCreateService;
import org.springblade.mdm.program.service.NcNodeService;
import org.springblade.mdm.program.service.NcProgramApprovedService;
-import org.springblade.mdm.utils.EntityUtil;
+import org.springblade.mdm.utils.ProgramFileNameParser;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -34,35 +36,40 @@
private NcNodeAutoCreateService ncNodeAutoCreateService;
/**
* DispatchFinishListener涓皟鐢�
- * @param props 鎵ц瀵硅薄
+ * @param props 娴佺▼灞炴��
*/
public void handleData(FlowProgramProperties props) {
// 鎵ц涓氬姟閫昏緫
- String instId = props.getProcessInstanceId();
+ LocalDateTime now = LocalDateTime.now();
NcNode packageNode;
if(FlowContants.Y.equals(props.getHasCuredProgram())){
//鏈夊浐鍖�
packageNode = ncNodeService.getById(props.getCuredNodeId());
if(FlowContants.N.equals(props.getCureProgramUseable())) {
- //绋嬪簭涓嶅彲鐢�
- //鍘熸潵鐨勫浐鍖栬妭鐐归攣瀹�
+ //绋嬪簭涓嶅彲鐢紝鍘熸潵鐨勫浐鍖栬妭鐐归攣瀹�
packageNode.lock();
ncNodeService.updateById(packageNode);
- Integer newVersion = packageNode.genNewVersionNumber();
+ //鐗堟湰鍙锋牴鎹浂缁勪欢鍙�+宸ュ簭鍙凤紝宸ュ簭鐗堟锛屾満搴婄粍 鐩存帴鏌ヨ鏁伴噺锛�+1鑾峰彇
+ Integer newVersion = ncNodeService.calculateVersionNumber(packageNode);
+ //Integer newVersion = packageNode.genNewVersionNumber();
+
packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,newVersion);
}else{
- //鍙敤锛屽崌鐗堬紙淇敼鍏跺伐搴忕増鏈級锛屽師鏉ョ殑鑺傜偣娓呴櫎
+ //鍙敤锛屽崌鐗堬紙淇敼鍏跺伐搴忕増娆★級锛屽師鏉ョ殑鑺傜偣娓呴櫎
moveToNewProcessEdition(packageNode,props);
}
}else{
//鏅�氳瘯鍒�
packageNode = ncNodeAutoCreateService.createNodeTreeWithProgram(props,1);
+ long hisSerial = ncNodeService.calculateHistorySerial(packageNode);
+ packageNode.setHisSerial(hisSerial);
+ ncNodeService.updateById(packageNode);
}
addApproveTable(packageNode,props);
- //updateApproveRecordNodeId(instId, packageNode.getId());
+
log.info("鏅�氭祦绋嬪凡瀹屾垚in DispatchFinishListener");
}
@@ -77,13 +84,13 @@
FlowProgramProperties tempProps = new FlowProgramProperties();
BeanUtils.copyProperties(props,tempProps);
tempProps.setProcessDefinitionKey(FlowContants.CURE_PROCESS_KEY);//涓存椂淇敼鍏朵负鍥哄寲,鍦ㄥ浐鍖栦笅鍒涘缓鑺傜偣
- NcNode machineNode = ncNodeAutoCreateService.createNodeTreeToMachine(tempProps);
+ NcNode machineGroupNode = ncNodeAutoCreateService.createNodeTreeToMachineGroup(tempProps);
//绉诲姩鍘嗗彶鑺傜偣鍒版柊鐨勭増娆¤妭鐐逛笅
- List<NcNode> packageHisNodes = ncNodeService.getNodeHistory(packageNode);//璇ュ寘鐨勫巻鍙茶妭鐐瑰垪琛�
+ List<NcNode> packageHisNodes = ncNodeService.getTryNodeHistory(packageNode);//璇ュ寘鐨勫巻鍙茶妭鐐瑰垪琛�
for(NcNode hisPackageNode : packageHisNodes){
- hisPackageNode.setParentId(machineNode.getParentId());
- hisPackageNode.setParentIds(machineNode.getParentIds());
+ hisPackageNode.setParentId(machineGroupNode.getId());
+ hisPackageNode.setParentIds(machineGroupNode.getParentIds()+","+machineGroupNode.getId());
List<NcNode> oriProgramNodes = ncNodeService.lambdaQuery().eq(NcNode::getParentId,hisPackageNode.getId()).list();
@@ -96,22 +103,33 @@
//绉诲姩绋嬪簭鍖呭悕鑺傜偣
packageNode.setProcessEdition(tempProps.getProcessEdition());
- packageNode.setParentId(machineNode.getParentId());
- packageNode.setParentIds(machineNode.getParentIds());
+ packageNode.setParentId(machineGroupNode.getId());
+ packageNode.setParentIds(machineGroupNode.getParentIds()+","+machineGroupNode.getId());
+ packageNode.setName(tempProps.getDrawingNo()+"-"+tempProps.getProcessNo()+"-"+tempProps.getProcessEdition());
this.ncNodeService.updateById(packageNode);
//绉诲姩绋嬪簭鑺傜偣
List<NcNode> programNodes = ncNodeService.getProgramFilesByPackageId(packageNode.getId());
for(NcNode programNode : programNodes){
+
+ programNode.setName(buildNewFilename(programNode.getName(),tempProps.getProcessEdition()));//鍚嶇О淇敼锛屽伐搴忕増娆￠儴鍒�
programNode.setParentIds(packageNode.getParentIds()+","+packageNode.getId());
programNode.setProcessEdition(tempProps.getProcessEdition());//淇敼宸ュ簭鐗堟
programNode.setVersionNumber(packageNode.getVersionNumber());
}
ncNodeService.updateBatchById(programNodes);
-
}
+ String buildNewFilename(String filename,String newProcessEdition){
+ ProgramNameVO pnameVO = ProgramFileNameParser.parseProgramName(filename);
+ String ext = FilenameUtils.getExtension(filename);
+ String name= pnameVO.getDrawingNo()+"-"+pnameVO.getProcessNo()+"-"+newProcessEdition+"-"+pnameVO.getSegmentCount()+"-"+pnameVO.getSegmentNo();
+ if(StringUtils.isNotBlank(ext)){
+ name += "."+ext;
+ }
+ return name;
+ }
/**
* 淇濆瓨瀹℃壒瀹屾垚鐨勮褰�
@@ -124,7 +142,7 @@
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);
--
Gitblit v1.9.3