From ddafa0375398053baaafdee8612f68c1b75ff7cb Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 22 八月 2025 13:37:54 +0800
Subject: [PATCH] 机床导入1
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 92 +++++++++++++++++++++++++++++++++++++---------
1 files changed, 74 insertions(+), 18 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 5fbf450..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;
@@ -20,14 +18,13 @@
import org.springblade.mdm.flow.service.CureFlowService;
import org.springblade.mdm.flow.service.FlowCommonService;
import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.program.entity.DncBackFile;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcProgramExchange;
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;
@@ -56,7 +53,8 @@
private final OssTemplate ossTemplate;
private final BladeRedis bladeRedis;
private final FlowCommonService flowCommonService;
-
+ private final DncBackFileService dncBackFileService;
+ private final ProgramFlowStatusQueryService programFlowStatusQueryService;
private String getFileKey(){
return "dncimpfile-"+ AuthUtil.getUserId();
}
@@ -102,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();
@@ -122,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);
@@ -133,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("鏈壘鍒扮▼搴忔枃浠朵腑鐨勭姸鎬佹敞閲�");
}
@@ -147,9 +153,9 @@
progData.setId(programPackageNode.getId());
progData.setProgramNo(programPackageNode.getProgramNo());
- List<String> fileEtriyNames = fileEntryNameList.stream().filter(n -> n.startsWith(packageName)).toList();
+ List<String> fileEntryNames = fileEntryNameList.stream().filter(n -> n.startsWith(packageName)).toList();
List<DncSendBackFile> programFiles = new ArrayList<>();
- fileEtriyNames.forEach( filePath ->{
+ fileEntryNames.forEach( filePath ->{
DncSendBackFile backFile = new DncSendBackFile();
backFile.setEntryName(filePath);
backFile.setName(StringUtils.removeStart(filePath,entryName));
@@ -171,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;
+ }
/**
* 鍏ュ簱鍥炰紶鏂囦欢,骞跺惎鍔ㄥ浐鍖栨祦绋�
@@ -210,6 +236,13 @@
}
+ /**
+ * 澶勭悊鍥炰紶鏂囦欢
+ * @param ossFileName
+ * @param acceptIdList
+ * @return
+ * @throws IOException
+ */
private Map<Long, List<FlowProgramFile>> dealWithBackFile(String ossFileName, List<Long> acceptIdList) throws IOException{
Map<Long, List<FlowProgramFile>> pkgIdFileMap = new HashMap<>();
@@ -230,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()){
@@ -246,8 +285,14 @@
//鏍规嵁鑺傜偣淇℃伅鏌ヨ娴佺▼
boolean active = flowCommonService.isProcessInstanceActive(packageNode.getProcessInstanceId());
if(active){
- throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁閲嶅鍏ュ簱銆�");
+ throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁绛夊緟瀹℃壒瀹屾垚銆�");
}
+
+ //楠岃瘉閮借繃浜嗭紝淇濆瓨dncbackFile
+ DncBackFile backFile = new DncBackFile();
+ backFile.setNcNodeId(packageNode.getId());
+ backFile.setOssName(ossFileName);
+ dncBackFileService.save(backFile);
List<FlowProgramFile> flowFiles = new ArrayList<>();
//鏌ユ壘鍖呬笅鐨勬枃浠舵暟鎹�,
@@ -291,6 +336,7 @@
* @param programPackageSubMap 鏂扮殑 绋嬪簭鍖呰妭鐐筰d -> =鏂囦欢鍒楄〃 map锛岀敤浜庡洖浼犳暟鎹�
* @throws IOException 璁块棶鏂囦欢寮傚父
*/
+ /*
List<NcNode> updateNodeDataByDNCBackData(String pkgFileName, List<Long> programPackageIdList,Map<Long,List<NcNode>> programPackageSubMap) throws IOException {
InputStream inputStream = this.ossTemplate.statFileStream(pkgFileName);
Path tempZipFile = createTempFile(inputStream);
@@ -391,7 +437,7 @@
return newProgramPackageNodeList;
}
-
+ */
/**
* 鍒涘缓涓�涓复鏃秡ip鏂囦欢
* @param inputStream 鏂囦欢鐨勮緭鍏ユ祦
@@ -428,7 +474,10 @@
}
try (InputStream fileIns = zipFile.getInputStream(zipFile.getEntry(entryName))) {
ByteArrayInputStream bos = new ByteArrayInputStream(fileIns.readAllBytes());
- boolean isText = FileContentUtil.isTextFile(bos);
+ boolean isText = StringUtils.endsWithIgnoreCase(entryName,".txt") || StringUtils.endsWithIgnoreCase(entryName,".nc")|| StringUtils.endsWithIgnoreCase(entryName,".xml");
+ if(!isText) {
+ isText = FileContentUtil.isTextFile(bos);
+ }
if (isText) {
bos.reset();
result = FileContentUtil.getContentFromStream(bos);
@@ -445,3 +494,10 @@
}
}
+
+@Data
+class PackageAndProcessEdition{
+ private String programPackageName;
+ private String processEdition;
+
+}
--
Gitblit v1.9.3