From fcee672452c02cc29e0e17ebc27a8c51698c6d0d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 20 九月 2025 17:28:44 +0800
Subject: [PATCH] 优化程序注释
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 98 +++++++++++++++++++++---------------------------
1 files changed, 43 insertions(+), 55 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 26f6105..5708e6f 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
@@ -18,6 +18,9 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.basesetting.machine.service.MachineService;
+import org.springblade.mdm.basesetting.producedivision.entity.QinzheFgb;
+import org.springblade.mdm.basesetting.producedivision.service.QinzheFgbService;
+import org.springblade.mdm.commons.contants.RegExpConstants;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.CureFlowService;
@@ -31,6 +34,7 @@
import org.springblade.mdm.program.vo.DncSendBackFile;
import org.springblade.mdm.program.vo.ProgramAnnotation;
import org.springblade.mdm.utils.FileContentUtil;
+import org.springblade.mdm.utils.ProgramFileNameParser;
import org.springblade.mdm.utils.ZipTextFileContentUtil;
import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.stereotype.Service;
@@ -43,6 +47,8 @@
import java.nio.file.StandardOpenOption;
import java.time.Duration;
import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -56,7 +62,7 @@
@AllArgsConstructor
public class DNCSendBackService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
private final CureFlowService cureFlowService;
- private final ProgramAnnotationService programAnnotationService;
+ private final QinzheFgbService qinzheFbgService;
private final NcNodeService ncNodeService;
private final OssTemplate ossTemplate;
private final BladeRedis bladeRedis;
@@ -130,28 +136,28 @@
}
}
- List<DictBiz> annotionDictList = programAnnotationService.getAnnotionDictList();
NcNode programPackageNode;
//鐩綍鍒楄〃锛屽嵆绋嬪簭鍖呭垪琛�
for(String entryName : dirEntryNameList){
DncSendBackData progData = new DncSendBackData();
String packageName = StringUtils.removeEnd(entryName,"/");
- progData.setProgramName(packageName);
Optional<String> optFilename = fileEntryNameList.stream().filter(n -> n.startsWith(entryName)).findFirst();
if(optFilename.isPresent()){
entry = zipFile.getEntry(optFilename.get());
InputStream ins = zipFile.getInputStream(entry);
- ByteArrayInputStream bais = new ByteArrayInputStream(IOUtils.toByteArray(ins));;
+ ByteArrayInputStream byteArrayIns = new ByteArrayInputStream(IOUtils.toByteArray(ins));
+
+ //瑙ｆ瀽鏈哄簥
progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
AnnotationProperties defAnnoProperties =AnnotationProperties.getDefault();
- String statusLine = FileContentUtil.readLineAt(bais,defAnnoProperties.getStatusLineIndex());//鐘舵�佹敞閲婅
- bais.reset();
- String sendPathLine = FileContentUtil.readLineAt(bais,defAnnoProperties.getSendPathLineIndex());//鐘舵�佹敞閲婅
- bais.reset();
+ String statusLine = FileContentUtil.readLineAt(byteArrayIns,defAnnoProperties.getStatusLineIndex());//鐘舵�佹敞閲婅
+ byteArrayIns.reset();
+ String sendPathLine = FileContentUtil.readLineAt(byteArrayIns,defAnnoProperties.getSendPathLineIndex());//鐘舵�佹敞閲婅
+ byteArrayIns.reset();
- if(statusLine.contains("GH")){
+ if(statusLine.contains(AnnotationUtil.GH)){
//鍥哄寲锛屼笉搴斿洖浼狅紝蹇界暐
log.warn("鐘舵�亄},涓嶅簲鍥炰紶锛屽拷鐣�",statusLine);
continue;
@@ -161,6 +167,8 @@
if(machine == null){
throw new ServiceException("鏍规嵁涓嬪彂璺緞鏈壘鍒扮▼搴忓搴旂殑鏈哄簥:"+sendPathLine);
}
+
+ progData.setProgramName(packageName);
if(statusLine.contains(AnnotationUtil.SQ)){
//璇曞垏
@@ -201,25 +209,35 @@
}
/**
- * 浠庢枃浠跺す鍚嶈В鏋愬嚭绋嬪簭鍖呭悕鍜屽拰宸ュ簭鐗堟
- * @param folderName 鏂囦欢澶瑰悕
- * @return 缁撴瀯鏁版嵁
+ * 淇绋嬪簭鍖呭悕,fanuc涓嶈瘑鍒笅鍒掔嚎锛屼笅鍙戞椂杞崲涓轰簡-锛岃繖閲岄渶瑕佺‘璁ゃ�傚簲璇ユ槸浠庡鍑鸿褰曚腑鏌ユ壘淇敼鍚庣殑鍖呭悕锛屼絾鏄幇鍦虹紪鍒剁殑娌℃湁鍜嬪姙锛�
+ * @param packageNameInZip
+ * @return
*/
/*
- PackageAndProcessEdition parseProgramPackageFromFolderName(String folderName){
- int index = StringUtils.lastIndexOf(folderName,'-');
- String processEditon = "";
- String packageName = "";
- if(index != -1){
- processEditon = folderName.substring(index+1);
- packageName = folderName.substring(0,index);
+ private String fixProgramPackageName(String packageNameInZip) {
+ Matcher matcher = RegExpConstants.PROGRAM_PACKAGE_PATTERN.matcher(packageNameInZip);
+
+ String drawingNo = null;
+ if(matcher.find()) {
+ drawingNo = matcher.group(1);
+ }
+ String processNo = null;
+ if(matcher.find()) {
+ processNo = matcher.group(2);
}
- PackageAndProcessEdition result = new PackageAndProcessEdition();;
- result.setProgramPackageName(packageName);
- result.setProcessEdition(processEditon);
- return result;
- }*/
+ String processEdition = null;
+ if(matcher.find()) {
+ processEdition = matcher.group(3);
+ }
+ if(drawingNo != null && processNo != null && processEdition != null) {
+ if(drawingNo.contains("_")) {
+
+ }
+ }
+ return packageNameInZip;
+ }
+ */
/**
* 鍏ュ簱鍥炰紶鏂囦欢,骞跺惎鍔ㄥ浐鍖栨祦绋�
@@ -371,37 +389,6 @@
String zipFileName = bladeRedis.get(getFileKey());
return ZipTextFileContentUtil.getTextContent(this.ossTemplate.statFileStream(zipFileName),entryName);
- /*
- try(InputStream inputStream = this.ossTemplate.statFileStream(zipFileName);){
- Path tempZipFile = createTempFile(inputStream);
-
- 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();
- if (!entryName.equals(entry.getName())) {
- continue;
- }
- try (InputStream fileIns = zipFile.getInputStream(zipFile.getEntry(entryName))) {
- ByteArrayInputStream bos = new ByteArrayInputStream(fileIns.readAllBytes());
- 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);
- } else {
- result = "<闈炴枃鏈枃浠�>";
- }
- }
-
- }
- }
- }
-
- return result;*/
}
}
@@ -415,3 +402,4 @@
return programPackageName+"-"+processEdition;
}
}
+
--
Gitblit v1.9.3