From a049dda2f63d59f5092994b44387fe0aa889d375 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 14 八月 2025 15:01:04 +0800
Subject: [PATCH] 固化流程
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 96 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 88 insertions(+), 8 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 3859a81..3dcb48c 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
@@ -166,15 +166,20 @@
*/
@Transactional
public void dncFileAccept(String ids) throws IOException {
- List<Long> idList = Func.toLongList(ids);
+ List<Long> acceptIdList = Func.toLongList(ids);
//
NcProgramExchange exchange;
String filekey = getFileKey();
- String pkgFileName = bladeRedis.get(filekey);
- log.info("filekey={},鏂囦欢鍚�={}",filekey,pkgFileName);
+ String zipFileName = bladeRedis.get(filekey);
+ log.info("filekey={},鏂囦欢鍚�={}",filekey,zipFileName);
Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();
- List<NcNode> newProgramPackageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
+
+ 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();
@@ -183,13 +188,88 @@
exchange.setNcNodeId(pkgNode.getId());
this.save(exchange);
- }
+ }*/
bladeRedis.del(filekey);
- this.ossTemplate.removeFile(pkgFileName);
- log.info("鍒犻櫎oss鏂囦欢:{}",pkgFileName);
+ this.ossTemplate.removeFile(zipFileName);
+ log.info("鍒犻櫎oss鏂囦欢:{}",zipFileName);
+ //cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
+ cureFlowService.startCureNew(pkgIdFileMap);
- cureFlowService.startCure(newProgramPackageList,programPackageSubMap);
+ }
+
+ private Map<Long, List<FlowProgramFile>> dealWithBackFile(String ossFileName, List<Long> acceptIdList) throws IOException{
+ Map<Long, List<FlowProgramFile>> pkgIdFileMap = new HashMap<>();
+
+ InputStream inputStream = this.ossTemplate.statFileStream(ossFileName);
+ Path tempZipFile = createTempFile(inputStream);
+ List<String> entryNameList = new ArrayList<>();
+
+ ZipEntry entry;
+ try (java.util.zip.ZipFile zipFile = new java.util.zip.ZipFile(tempZipFile.toFile())) {
+ 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,acceptIdList).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();
+
+ if(optPackageNode.isEmpty()){
+ throw new ServiceException("鎵句笉鍒扮▼搴�"+programPackageName);
+ }
+
+ NcNode packageNode = optPackageNode.get();
+ if(packageNode.hasCured()) {
+ throw new ServiceException(programPackageName + "宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
+ }
+
+ //妫�鏌ユ槸鍚﹀湪瀹℃壒杩囩▼涓�
+ //鏍规嵁鑺傜偣淇℃伅鏌ヨ娴佺▼
+ boolean active = flowCommonService.isProcessInstanceActive(packageNode.getProcessInstanceId());
+ if(active){
+ throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁閲嶅鍏ュ簱銆�");
+ }
+
+ List<FlowProgramFile> flowFiles = new ArrayList<>();
+ //鏌ユ壘鍖呬笅鐨勬枃浠舵暟鎹�,
+ entryNameList.stream().filter(s -> s.startsWith(dir)).forEach(entryName -> {
+ log.info("{}涓嬬殑鏂囦欢锛歿}",dir,entryName);
+
+ if(!entryName.endsWith("/")){
+ //瀹為檯鐨勬枃浠�
+ String fileName = StringUtils.removeStart(entryName,dir);//鍘婚櫎鏂囦欢鍚嶈矾寰勯儴鍒�
+
+ try {
+ FlowProgramFile newFlowFile = new FlowProgramFile();
+ newFlowFile.setProgramName(packageNode.getName());
+ newFlowFile.setProcessInstanceId(null);//鍏堢疆涓虹┖锛屽惎鍔ㄦ祦绋嬪悗璁剧疆璇ュ��
+ newFlowFile.setFileType("program");
+
+ InputStream ins = zipFile.getInputStream(zipFile.getEntry(entryName));
+ BladeFile newOssFile = ossTemplate.putFile("mdm",fileName,ins);
+ newFlowFile.setOssName(newOssFile.getName());
+
+ flowFiles.add(newFlowFile);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ });
+
+ pkgIdFileMap.put(packageNode.getId(),flowFiles);
+ }
+
+ }
+
+ return pkgIdFileMap;
}
/**
--
Gitblit v1.9.3