From 1911be8941e5fe2705c2c56e74e52bd426468793 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 06 八月 2025 15:26:34 +0800
Subject: [PATCH] 固化流程，建立node；
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 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 18a6aa9..8923526 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
@@ -88,8 +88,7 @@
List<DncSendBackData> parseDncZipFromByteArray(InputStream inputStream) throws IOException {
List<DncSendBackData> list = new ArrayList<>();
Path tempZipFile = createTempFile(inputStream);
- //Map<String,String> fileMd5Map = new HashMap<>();
- Map<String,DncSendBackData> fileDataMap = new HashMap<>();
+
try (ZipFile zipFile = new ZipFile(tempZipFile.toFile())) {
ZipEntry entry;
@@ -130,11 +129,13 @@
List<Long> idList = Func.toLongList(ids);
//
NcProgramExchange exchange;
- String pkgFileName = bladeRedis.get(getFileKey());
+ String filekey = getFileKey();
+ String pkgFileName = bladeRedis.get(filekey);
+ 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){
exchange = new NcProgramExchange();
exchange.setName(pkgNode.getName());
@@ -143,6 +144,9 @@
this.save(exchange);
}
+ bladeRedis.del(filekey);
+ this.ossTemplate.removeFile(pkgFileName);
+ log.info("鍒犻櫎oss鏂囦欢:{}",pkgFileName);
cureFlowService.startCure(newProgramPckageList,programPackageSubMap);
}
@@ -172,6 +176,7 @@
List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
for(String dir : dirList){
String programPackageName = StringUtils.removeEnd(dir,"/");
+
NcNode oriProgramPkg = this.ncNodeService.getLastEditionProgramPackage(programPackageName);
if(oriProgramPkg == null){
log.warn("鏈彂鐜板尮閰嶇殑绋嬪簭鍖呭悕{}",programPackageName);
@@ -180,6 +185,7 @@
if(!programPackageIdList.contains(oriProgramPkg.getId())){
//涓嶅湪鍕鹃�夌殑鑼冨洿鍐�
+ log.info("{}涓嶅湪鍕鹃�夎寖鍥村唴",programPackageName);
continue;
}
NcNode newProgramPkg = new NcNode();
@@ -244,6 +250,8 @@
}
}
+
+
return newProgramPackageNodeList;
}
--
Gitblit v1.9.3