From 9810791a41d381a10451f3e9770cfcfedf98e886 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 00:39:34 +0800
Subject: [PATCH] 增加首页搜索接口

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java |   61 ++++++++++++++++++++++++------
 1 files changed, 49 insertions(+), 12 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 befdbe1..e5c132e 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
@@ -1,13 +1,11 @@
 
 package org.springblade.mdm.program.service;
 
-import com.alibaba.fastjson.JSONObject;
-import io.netty.util.internal.StringUtil;
 import lombok.AllArgsConstructor;
+import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.base.BizEntity;
 import org.springblade.core.mp.base.BizServiceImpl;
 import org.springblade.core.oss.OssTemplate;
 import org.springblade.core.oss.model.BladeFile;
@@ -26,9 +24,7 @@
 import org.springblade.mdm.program.mapper.NcProgramExchangeMapper;
 import org.springblade.mdm.program.vo.DncSendBackData;
 import org.springblade.mdm.program.vo.DncSendBackFile;
-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;
 import org.springframework.web.multipart.MultipartFile;
@@ -104,7 +100,7 @@
 		Path tempZipFile = createTempFile(inputStream);
 
 		List<String> fileEntryNameList = new ArrayList<>();
-		List<String> dirEntryNameList = new ArrayList<>();
+		List<String> dirEntryNameList = new ArrayList<>();//绋嬪簭鍖呭悕+宸ュ簭鐗堟 浣滀负鏂囦欢澶瑰悕
 		try (ZipFile zipFile = new ZipFile(tempZipFile.toFile())) {
 
 			Enumeration<? extends ZipEntry> zipEntries = zipFile.entries();
@@ -124,10 +120,18 @@
 			//鐩綍鍒楄〃锛屽嵆绋嬪簭鍖呭垪琛�
 			for(String entryName : dirEntryNameList){
 				DncSendBackData progData = new DncSendBackData();
-				String packageName = StringUtils.removeEnd(entryName,"/");
+				String folderName = StringUtils.removeEnd(entryName,"/");
+
+				PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
+				String packageName = pkgAndEdition.getProgramPackageName();
+				String processEdition = pkgAndEdition.getProcessEdition();
+				if(StringUtils.isBlank(packageName) || StringUtils.isBlank(processEdition)){
+					throw new ServiceException("鍖呭唴鏂囦欢澶瑰悕鏍煎紡閿欒搴旇涓篬闆剁粍浠跺彿-宸ュ簭鍙�-宸ュ簭鐗堟]:"+folderName);
+				}
+
 				progData.setProgramName(packageName);
 				String statusLine = "";
-				Optional<String> optFilename = fileEntryNameList.stream().filter(n -> n.startsWith(packageName)).findFirst();
+				Optional<String> optFilename = fileEntryNameList.stream().filter(n -> n.startsWith(entryName)).findFirst();
 				if(optFilename.isPresent()){
 					entry = zipFile.getEntry(optFilename.get());
 					InputStream ins = zipFile.getInputStream(entry);
@@ -135,13 +139,13 @@
 					statusLine = FileContentUtil.readLineAt(ins,2);
 					if(statusLine.contains("SQ")){
 						//璇曞垏
-						programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
+						programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);
 					}else if(statusLine.contains("GH")){
 						//鍥哄寲
-						programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName);
+						programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName,processEdition);
 					}else if(statusLine.contains("PL")){
 						//鍋忕
-						programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);
+						programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName,processEdition);
 					}else{
 						throw new ServiceException("鏈壘鍒扮▼搴忔枃浠朵腑鐨勭姸鎬佹敞閲�");
 					}
@@ -173,6 +177,26 @@
 		return list;
 	}
 
+	/**
+	 * 浠庢枃浠跺す鍚嶈В鏋愬嚭绋嬪簭鍖呭悕鍜屽拰宸ュ簭鐗堟
+	 * @param folderName 鏂囦欢澶瑰悕
+	 * @return 缁撴瀯鏁版嵁
+	 */
+	PackageAndProcessEdition parseProgramPackageFromFolderName(String folderName){
+		int index = StringUtils.lastIndexOf(folderName,'-');
+		String processEditon = "";
+		String temp;
+		String packageName = "";
+		if(index != -1){
+			processEditon = folderName.substring(index+1);
+			packageName = folderName.substring(0,index);
+		}
+
+		PackageAndProcessEdition result = new PackageAndProcessEdition();;
+		result.setProgramPackageName(packageName);
+		result.setProcessEdition(processEditon);
+		return result;
+	}
 
 	/**
 	 * 鍏ュ簱鍥炰紶鏂囦欢,骞跺惎鍔ㄥ浐鍖栨祦绋�
@@ -239,7 +263,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()){
@@ -464,3 +494,10 @@
 	}
 
 }
+
+@Data
+class PackageAndProcessEdition{
+	private String programPackageName;
+	private String processEdition;
+
+}

--
Gitblit v1.9.3