From eebd71b9197ba70f21d161958a1e5ae0539dcd47 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 22:48:23 +0800
Subject: [PATCH] 修复偏离单回传程序版本都是2的问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 28 +++++++---------------------
1 files changed, 7 insertions(+), 21 deletions(-)
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 72b56cd..9d7da5f 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
@@ -78,7 +78,6 @@
bladeRedis.setEx(getFileKey(),bfile.getName(), Duration.ofHours(2));
try(InputStream zipFileInputStream = ossTemplate.statFileStream(bfile.getName());) {
- //InputStream zipFileInputStream = file.getInputStream();//test
list = parseProgramListFromZip(zipFileInputStream);
}
} catch (IOException e) {
@@ -211,27 +210,8 @@
String zipFileName = bladeRedis.get(filekey);
log.info("filekey={},鏂囦欢鍚�={}",filekey,zipFileName);
- //Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();
-
Map<Long,List<FlowProgramFile>> pkgIdFileMap = dealWithBackFile(zipFileName,acceptIdList);
- ///List<NcNode> newProgramPackageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
- //updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
- /*
- log.info("闇�瑕佸惎鍔ㄥ浐鍖栨祦绋嬬殑绋嬪簭鍖呭悕鏁伴噺:{}",newProgramPackageList.size());
- for(NcNode pkgNode :newProgramPackageList){
- exchange = new NcProgramExchange();
- exchange.setName(pkgNode.getName());
- exchange.setExchangeType(2);//鍥炰紶
- exchange.setNcNodeId(pkgNode.getId());
-
- this.save(exchange);
- }*/
- //bladeRedis.del(filekey);
- //this.ossTemplate.removeFile(zipFileName);
- //log.info("鍒犻櫎oss鏂囦欢:{}",zipFileName);
-
- //cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
cureFlowService.startCureNew(pkgIdFileMap);
}
@@ -263,7 +243,13 @@
//鏍规嵁鍐呴儴鏂囦欢锛岃鍙栧拰鍒嗘瀽绋嬪簭鍖呭拰绋嬪簭鏂囦欢鏁版嵁
List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
for(String dir : dirList){
- String programPackageName = StringUtils.removeEnd(dir,"/");
+ String programPackageName1 = StringUtils.removeEnd(dir,"/");
+ String folderName = StringUtils.removeEnd(dir,"/");
+
+ PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
+ String programPackageName = pkgAndEdition.getProgramPackageName();
+ //111
+
Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();
if(optPackageNode.isEmpty()){
--
Gitblit v1.9.3