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 | 155 +++++++++++++++++++++++----------------------------
1 files changed, 71 insertions(+), 84 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 7ff4b64..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
@@ -5,6 +5,7 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.base.BizServiceImpl;
@@ -17,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;
@@ -25,10 +29,12 @@
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.service.programannotation.*;
import org.springblade.mdm.program.vo.DncSendBackData;
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;
@@ -41,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;
@@ -54,15 +62,15 @@
@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;
private final FlowCommonService flowCommonService;
private final DncBackFileService dncBackFileService;
- private final ProgramFlowStatusQueryService programFlowStatusQueryService;
private final MachineService machineService;
private final ParamService paramService;
+
/**
* 鍋忕鍗曟枃浠舵湯灏剧殑妯″紡锛歅+鏁板瓧
*/
@@ -128,49 +136,48 @@
}
}
- List<DictBiz> annotionDictList = programAnnotationService.getAnnotionDictList();
NcNode programPackageNode;
//鐩綍鍒楄〃锛屽嵆绋嬪簭鍖呭垪琛�
for(String entryName : dirEntryNameList){
DncSendBackData progData = new DncSendBackData();
- String folderName = StringUtils.removeEnd(entryName,"/");
+ String packageName = 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(entryName)).findFirst();
if(optFilename.isPresent()){
entry = zipFile.getEntry(optFilename.get());
InputStream ins = zipFile.getInputStream(entry);
+ ByteArrayInputStream byteArrayIns = new ByteArrayInputStream(IOUtils.toByteArray(ins));
+
+ //瑙ｆ瀽鏈哄簥
progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
- statusLine = FileContentUtil.readLineAt(ins,2);
- if(statusLine.contains("SQ")){
+
+ AnnotationProperties defAnnoProperties =AnnotationProperties.getDefault();
+ String statusLine = FileContentUtil.readLineAt(byteArrayIns,defAnnoProperties.getStatusLineIndex());//鐘舵�佹敞閲婅
+ byteArrayIns.reset();
+ String sendPathLine = FileContentUtil.readLineAt(byteArrayIns,defAnnoProperties.getSendPathLineIndex());//鐘舵�佹敞閲婅
+ byteArrayIns.reset();
+
+ if(statusLine.contains(AnnotationUtil.GH)){
+ //鍥哄寲锛屼笉搴斿洖浼狅紝蹇界暐
+ log.warn("鐘舵�亄},涓嶅簲鍥炰紶锛屽拷鐣�",statusLine);
+ continue;
+ }
+
+ Machine machine = this.machineService.getMachineBySendPathAnnotation(sendPathLine);
+ if(machine == null){
+ throw new ServiceException("鏍规嵁涓嬪彂璺緞鏈壘鍒扮▼搴忓搴旂殑鏈哄簥:"+sendPathLine);
+ }
+
+ progData.setProgramName(packageName);
+
+ if(statusLine.contains(AnnotationUtil.SQ)){
//璇曞垏
- programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);
- }else if(statusLine.contains("GH")){
- //鍥哄寲
- programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName,processEdition);
- }else if(statusLine.contains("PL")){
- //鍋忕
- programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName,processEdition);
+ programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);//TODO 杩橀渶鏍规嵁鏈哄簥缁勶紙濡備綍鑾峰彇锛熸牴鎹笅鍙戣矾寰勮幏鍙栨満搴婏紝杩涜�岃幏鍙栵級锛�,processEdition
+ }else if(statusLine.contains(AnnotationUtil.LG)){
+ //涓存椂鏇存敼鍗�
+ programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);
}else{
- //鏌ヨ鏄惁杞﹀簥锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊
- programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);
- if(programPackageNode!=null){
- Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
- String chechuangVal = paramService.turninngValue();
- if(StringUtils.equals(machine.getMachineSpec(),chechuangVal)){
- //杞﹀簥
- ProgramAnnotation pa = programAnnotationService.getProgramAnnotationFormat(machine.getMachineGroupCode(),annotionDictList);
- statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);
- }
- }
+ throw new ServiceException("鐘舵�佹敞閲婁笉鍦ㄨ寖鍥村唴:"+statusLine+",浠呰瘯鍒囥�佷复鏃舵洿鏀瑰崟鍙互鍥炰紶");
}
if(programPackageNode != null) {
@@ -202,25 +209,35 @@
}
/**
- * 浠庢枃浠跺す鍚嶈В鏋愬嚭绋嬪簭鍖呭悕鍜屽拰宸ュ簭鐗堟
- * @param folderName 鏂囦欢澶瑰悕
- * @return 缁撴瀯鏁版嵁
+ * 淇绋嬪簭鍖呭悕,fanuc涓嶈瘑鍒笅鍒掔嚎锛屼笅鍙戞椂杞崲涓轰簡-锛岃繖閲岄渶瑕佺‘璁ゃ�傚簲璇ユ槸浠庡鍑鸿褰曚腑鏌ユ壘淇敼鍚庣殑鍖呭悕锛屼絾鏄幇鍦虹紪鍒剁殑娌℃湁鍜嬪姙锛�
+ * @param packageNameInZip
+ * @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);
+ /*
+ 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;
}
+ */
/**
* 鍏ュ簱鍥炰紶鏂囦欢,骞跺惎鍔ㄥ浐鍖栨祦绋�
@@ -268,10 +285,7 @@
//鏍规嵁鍐呴儴鏂囦欢锛岃鍙栧拰鍒嗘瀽绋嬪簭鍖呭拰绋嬪簭鏂囦欢鏁版嵁
List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
for(String dir : dirList){
- String folderName = StringUtils.removeEnd(dir,"/");
-
- PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
- String programPackageName = pkgAndEdition.getProgramPackageName();
+ String programPackageName = StringUtils.removeEnd(dir,"/");
Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();
@@ -311,7 +325,7 @@
FlowProgramFile newFlowFile = new FlowProgramFile();
newFlowFile.setProgramName(packageNode.getName());
newFlowFile.setProcessInstanceId(null);//鍏堢疆涓虹┖锛屽惎鍔ㄦ祦绋嬪悗璁剧疆璇ュ��
- newFlowFile.setFileType("program");
+ newFlowFile.setFileType(FlowProgramFile.TYPE_PROGRAM);
newFlowFile.setName(fileName);
InputStream ins = zipFile.getInputStream(zipFile.getEntry(entryName));
BladeFile newOssFile = ossTemplate.putFile("mdm",fileName,ins);
@@ -375,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,4 +398,8 @@
private String programPackageName;
private String processEdition;
+ public String programName(){
+ return programPackageName+"-"+processEdition;
+ }
}
+
--
Gitblit v1.9.3