From 33e6270d2d3a40591e58d45fd8435d2f3eaf66b2 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 14 八月 2025 11:02:56 +0800
Subject: [PATCH] 启动固化流程优化
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 135 +++++++++++++++++++++++++--------------------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/CureFlowService.java | 4
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 19 ++++++
3 files changed, 95 insertions(+), 63 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 ae9b820..92482e5 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
@@ -52,10 +52,10 @@
private final FlowProgramFileService flowProgramFileService;
@Transactional
- public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFiles) {
+ public void startCure(List<NcNode> programPackageList, Map<Long,List<NcNode>> allFlowProgramFilesMap) {
//鏍规嵁鍒嗙粍鍚姩娴佺▼锛屽苟鎻掑叆鍏宠仈琛�
programPackageList.forEach(pkg -> {
- this.startOne(pkg,allFlowProgramFiles.get(pkg.getId()));
+ this.startOne(pkg,allFlowProgramFilesMap.get(pkg.getId()));
});
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
index 5b6f68f..3859a81 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java
@@ -25,6 +25,7 @@
import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.utils.EntityUtil;
+import org.springblade.mdm.utils.FileContentUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -79,7 +80,6 @@
InputStream zipFileInputStream = file.getInputStream();//test
- //byte[] bytes = FileUtil.copyToByteArray(zipFileInputStream);
list = parseProgramListFromZip(zipFileInputStream);
} catch (IOException e) {
@@ -100,34 +100,60 @@
List<DncSendBackData> list = new ArrayList<>();
Path tempZipFile = createTempFile(inputStream);
+ List<String> fileEntryNameList = new ArrayList<>();
+ List<String> dirEntryNameList = new ArrayList<>();
try (ZipFile zipFile = new ZipFile(tempZipFile.toFile())) {
+ Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
ZipEntry entry;
- Enumeration<? extends ZipEntry> zipEntris = zipFile.entries();
- while (zipEntris.hasMoreElements()) {
- entry = zipEntris.nextElement();
- DncSendBackData progData = new DncSendBackData();
- String entryName = entry.getName();
- if (entry.isDirectory()){
- //鐩綍锛屾墠鏄▼搴忓寘锛�
- //鏌ヨ鏁版嵁搴擄紝瀵瑰簲涓婃墠鑳界‘璁ゆ椂鏈夋晥鐨勭▼搴忓寘
- String packageName = StringUtils.removeEnd(entryName,"/");
- NcNode programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
- NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(packageName);
+ //鑾峰彇鎵�鏈夌殑entry鍚嶇О
+ while (zipEntries.hasMoreElements()) {
+ entry = zipEntries.nextElement();
- if(programPackageNode!=null && curedProgramPkg == null) {//鏃犲浐鍖栫▼搴忥紝鎵嶆斁鍏ュ垪琛�
- //NcNode programPackageNode = pkgList.get(0);
- progData.setId(programPackageNode.getId());
- progData.setProgramName(packageName);
-
- progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
- progData.setProgramNo(programPackageNode.getProgramNo());
- list.add(progData);
- }
-
+ if(entry.isDirectory()){
+ dirEntryNameList.add(entry.getName());
+ }else{
+ fileEntryNameList.add(entry.getName());
}
}
+ NcNode programPackageNode;
+ //鐩綍鍒楄〃锛屽嵆绋嬪簭鍖呭垪琛�
+ for(String entryName : dirEntryNameList){
+ DncSendBackData progData = new DncSendBackData();
+ String packageName = StringUtils.removeEnd(entryName,"/");
+ progData.setProgramName(packageName);
+ String statusLine = "";
+ Optional<String> optFilename = fileEntryNameList.stream().filter(n -> n.startsWith(packageName)).findFirst();
+ if(optFilename.isPresent()){
+ entry = zipFile.getEntry(optFilename.get());
+ InputStream ins = zipFile.getInputStream(entry);
+ progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
+ statusLine = FileContentUtil.readLineAt(ins,2);
+ if(statusLine.contains("SQ")){
+ //璇曞垏
+ programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
+ }else if(statusLine.contains("GH")){
+ //鍥哄寲
+ programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName);
+ }else if(statusLine.contains("PL")){
+ //鍋忕
+ programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);
+ }else{
+ throw new ServiceException("鏈壘鍒扮▼搴忔枃浠朵腑鐨勭姸鎬佹敞閲�");
+ }
+ if(programPackageNode != null) {
+ progData.setId(programPackageNode.getId());
+ progData.setProgramNo(programPackageNode.getProgramNo());
+ list.add(progData);
+ }else{
+ throw new ServiceException("鎵句笉鍒扮▼搴忓寘鍚�:"+packageName+statusLine);
+ }
+ }else{
+ throw new ServiceException(entryName+"鍖呬笅鏈壘鍒版枃浠�"+statusLine);
+ }
+
+ }
}
return list;
@@ -148,9 +174,9 @@
log.info("filekey={},鏂囦欢鍚�={}",filekey,pkgFileName);
Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();
- List<NcNode> newProgramPckageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
- log.info("闇�瑕佸惎鍔ㄥ浐鍖栨祦绋嬬殑绋嬪簭鍖呭悕鏁伴噺:{}",newProgramPckageList.size());
- for(NcNode pkgNode :newProgramPckageList){
+ List<NcNode> newProgramPackageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
+ log.info("闇�瑕佸惎鍔ㄥ浐鍖栨祦绋嬬殑绋嬪簭鍖呭悕鏁伴噺:{}",newProgramPackageList.size());
+ for(NcNode pkgNode :newProgramPackageList){
exchange = new NcProgramExchange();
exchange.setName(pkgNode.getName());
exchange.setExchangeType(2);//鍥炰紶
@@ -162,7 +188,8 @@
this.ossTemplate.removeFile(pkgFileName);
log.info("鍒犻櫎oss鏂囦欢:{}",pkgFileName);
- cureFlowService.startCure(newProgramPckageList,programPackageSubMap);
+
+ cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
}
/**
@@ -180,53 +207,47 @@
ZipEntry entry;
try (java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(tempZipFile.toFile())) {
- Enumeration<? extends ZipEntry> entris = zipFile.entries();
- while(entris.hasMoreElements()) {
- entry = entris.nextElement();
+ Enumeration<? extends ZipEntry> entries = zipFile.entries();
+ while(entries.hasMoreElements()) {
+ entry = entries.nextElement();
entryNameList.add(entry.getName());
}
log.info("allentrynames:{}",entryNameList);
+
+ List<NcNode> allAcceptPackages = this.ncNodeService.lambdaQuery().in(NcNode::getId,programPackageIdList).list();
//鏍规嵁鍐呴儴鏂囦欢锛岃鍙栧拰鍒嗘瀽绋嬪簭鍖呭拰绋嬪簭鏂囦欢鏁版嵁
List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
for(String dir : dirList){
String programPackageName = StringUtils.removeEnd(dir,"/");
+ Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();
- NcNode tryProgramPkg = this.ncNodeService.getLastEditionTryingProgramPackage(programPackageName);
- NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(programPackageName);
- if(curedProgramPkg != null){
- throw new ServiceException(programPackageName+"宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
+ if(optPackageNode.isEmpty()){
+ throw new ServiceException("鎵句笉鍒扮▼搴�"+programPackageName);
}
- if(tryProgramPkg == null){
- log.warn("鏂囦欢澶规湭鍙戠幇鍖归厤鐨勭▼搴忓寘鍚峽}",dir);
- continue;
+
+ NcNode packageNode = optPackageNode.get();
+ if(packageNode.hasCured()) {
+ throw new ServiceException(programPackageName + "宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
}
+
//妫�鏌ユ槸鍚﹀湪瀹℃壒杩囩▼涓�
//鏍规嵁鑺傜偣淇℃伅鏌ヨ娴佺▼
- boolean active = flowCommonService.isProcessInstanceActive(tryProgramPkg.getProcessInstanceId());
+ boolean active = flowCommonService.isProcessInstanceActive(packageNode.getProcessInstanceId());
if(active){
throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁閲嶅鍏ュ簱銆�");
}
- /*
- if(oriProgramPkg.hasCured()){
- throw new ServiceException(programPackageName+"宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
- }*/
- if(!programPackageIdList.contains(tryProgramPkg.getId())){
- //涓嶅湪鍕鹃�夌殑鑼冨洿鍐�
- log.info("{}涓嶅湪鍕鹃�夎寖鍥村唴",programPackageName);
- continue;
- }
NcNode newProgramPkg = new NcNode();
- BeanUtils.copyProperties(tryProgramPkg, newProgramPkg);
+ BeanUtils.copyProperties(packageNode, newProgramPkg);
EntityUtil.clearBaseProperties(newProgramPkg);
newProgramPkg.setIsLastEdition(1);
ncNodeService.save(newProgramPkg);
newProgramPackageNodeList.add(newProgramPkg);
//鏃ф暟鎹洿鏂颁负鑰佺増鏈�
- tryProgramPkg.setIsLocked(1);//鏃х増鑷姩閿佸畾
- tryProgramPkg.setIsLastEdition(0);;
- ncNodeService.updateById(tryProgramPkg);
+ packageNode.setIsLocked(1);//鏃х増鑷姩閿佸畾
+ packageNode.setIsLastEdition(0);;
+ ncNodeService.updateById(packageNode);
//List<FlowProgramFile> newFlowFiles = new ArrayList<>();
List<NcNode> newProgramNodes = new ArrayList<>();
@@ -236,26 +257,25 @@
if(!entryName.endsWith("/")){
//瀹為檯鐨勬枃浠�
String fileName = StringUtils.removeStart(entryName,dir);//鍘婚櫎鏂囦欢鍚嶈矾寰勯儴鍒�
- NcNode oldProgramNode = this.ncNodeService.getLastEditionProgramFile(fileName,tryProgramPkg.getId());
+ NcNode oldProgramNode = this.ncNodeService.getLastEditionProgramFile(fileName,packageNode.getId());
if(oldProgramNode == null){
log.info("{}鎵句笉鍒扮▼搴忔枃浠�",entryName);
- return;
+ throw new ServiceException(programPackageName+"涓嬫壘涓嶅埌绋嬪簭鏂囦欢"+fileName);
}
+ //鍒涘缓鏂扮増鏈殑绋嬪簭鑺傜偣
NcNode newProgramNode = new NcNode();
BeanUtils.copyProperties(oldProgramNode, newProgramNode);
EntityUtil.clearBaseProperties(newProgramNode);
newProgramNode.setIsLastEdition(1);
newProgramNode.setParentId(newProgramPkg.getId());
newProgramNode.setParentIds(newProgramPkg.getParentIds()+","+newProgramPkg.getId());
- //ncNodeService.save(newProgramNode);
- //灏嗗洖浼犳枃浠朵笂浼狅紝骞惰褰曞埌鏁版嵁搴�
FlowProgramFile oldFlowFile = flowProgramFileService.getById(newProgramNode.getFlowProgramFileId());
FlowProgramFile newFlowFile = new FlowProgramFile();
BeanUtils.copyProperties(oldFlowFile, newFlowFile);
- newFlowFile.setProcessInstanceId(null);
+ newFlowFile.setProcessInstanceId(null);//鍏堢疆涓虹┖锛屽惎鍔ㄦ祦绋嬪悗璁剧疆璇ュ��
EntityUtil.clearBaseProperties(newFlowFile);
try {
@@ -269,10 +289,6 @@
newProgramNode.setVersionNumber(oldProgramNode.genNewVersionNumber());
newProgramNodes.add(newProgramNode);
//鏃ц妭鐐瑰鐞嗭紝鍜嬪姙锛熷鏋滃鍑哄伐鎺х綉 閲嶅瀵煎嚭鍛紵锛宨sLastEdition涓嶇敤璁剧疆浜嗭紝鍥犱负 绋嬪簭鍖呰妭鐐� 鏄柊鐨�
- //TODO 寰呴獙璇�
- //oldProgramNode.setIsLastEdition(鍘熸潵鏄�0);
- //oldProgramNode.setIsLocked(1);
- //ncNodeService.updateById(oldProgramNode);
}
});
@@ -280,7 +296,6 @@
}
}
-
return newProgramPackageNodeList;
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
index dae2753..4255df9 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
@@ -244,7 +244,24 @@
*/
public NcNode getLastEditionCuredProgramPackage(String programPkgName) {
List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
- .eq(NcNode::getName, programPkgName).eq(NcNode::getIsCured,1)
+ .eq(NcNode::getName, programPkgName).likeRight(NcNode::getParentIds,"0,2,").eq(NcNode::getIsCured,1)
+ .eq(NcNode::getIsLastEdition,1).list();
+
+ if(nodes.isEmpty()){
+ return null;
+ }else {
+ return nodes.get(0);
+ }
+ }
+
+ /**
+ * 鑾峰彇鏈�鏂扮増鏈殑 鍋忕鑺傜偣
+ * @param programPkgName 绋嬪簭鍖呭悕
+ * @return 鍋忕鐨勭▼搴忚妭鐐�
+ */
+ public NcNode getLastEditionDeviationProgramPackage(String programPkgName) {
+ List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
+ .eq(NcNode::getName, programPkgName).likeRight(NcNode::getParentIds,"0,3,")
.eq(NcNode::getIsLastEdition,1).list();
if(nodes.isEmpty()){
--
Gitblit v1.9.3