From b0d0191a88912b352385349461b500a4964d693b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 19 九月 2025 22:51:24 +0800
Subject: [PATCH] 机床加字段
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 75 ++++++++++++-------------------------
1 files changed, 24 insertions(+), 51 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 e34f27a..26f6105 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
@@ -26,10 +26,7 @@
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.AnnotationProcessor;
-import org.springblade.mdm.program.service.programannotation.DefaultProcessor;
-import org.springblade.mdm.program.service.programannotation.FanucProcessor;
-import org.springblade.mdm.program.service.programannotation.MachineAnnotationConfig;
+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;
@@ -41,13 +38,11 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.*;
-import java.lang.annotation.Annotation;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.time.Duration;
import java.util.*;
-import java.util.regex.Pattern;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
@@ -69,10 +64,7 @@
private final DncBackFileService dncBackFileService;
private final MachineService machineService;
private final ParamService paramService;
- private final MachineAnnotationConfig machineAnnotationConfig;
- private final FanucProcessor fanucProcessor;
- private final DefaultProcessor defaultProcessor;
/**
* 鍋忕鍗曟枃浠舵湯灏剧殑妯″紡锛歅+鏁板瓧
*/
@@ -143,57 +135,41 @@
//鐩綍鍒楄〃锛屽嵆绋嬪簭鍖呭垪琛�
for(String entryName : dirEntryNameList){
DncSendBackData progData = new DncSendBackData();
- String folderName = StringUtils.removeEnd(entryName,"/");
-
- //PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
- String packageName = folderName;//pkgAndEdition.getProgramPackageName();
- //String processEdition = pkgAndEdition.getProcessEdition();
- /*
- if(StringUtils.isBlank(packageName) || StringUtils.isBlank(processEdition)){
- throw new ServiceException("鍖呭唴鏂囦欢澶瑰悕鏍煎紡閿欒锛屽簲璇ヤ负[闆剁粍浠跺彿-宸ュ簭鍙�-宸ュ簭鐗堟]:"+folderName);
- }*/
+ String packageName = StringUtils.removeEnd(entryName,"/");
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 bais = new ByteArrayInputStream(IOUtils.toByteArray(ins));;
progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
- //machineAnnotationConfig.getConfigMap().get(machine.getcon)
- Pattern fanucPattern = Pattern.compile("^[oO]\\d{4}");
- String testLine = FileContentUtil.readLineAt(bais,2);//TODO,fanuc杩欒鏄笅鍙戣矾寰勶紝鍏朵粬鏈哄櫒鏄姸鎬�
+
+ AnnotationProperties defAnnoProperties =AnnotationProperties.getDefault();
+ String statusLine = FileContentUtil.readLineAt(bais,defAnnoProperties.getStatusLineIndex());//鐘舵�佹敞閲婅
bais.reset();
- //boolean isFanuc = fanucPattern.matcher(testLine).matches();
- boolean isFanuc = !StringUtils.containsAny(testLine,"(SQ)","(GH)","(PL)");
- if(isFanuc){
- statusLine = FileContentUtil.readLineAt(bais,3);//fanuc鐨勭姸鎬佽绗�4琛�
- }else{
- statusLine = testLine;
+ String sendPathLine = FileContentUtil.readLineAt(bais,defAnnoProperties.getSendPathLineIndex());//鐘舵�佹敞閲婅
+ bais.reset();
+
+ if(statusLine.contains("GH")){
+ //鍥哄寲锛屼笉搴斿洖浼狅紝蹇界暐
+ log.warn("鐘舵�亄},涓嶅簲鍥炰紶锛屽拷鐣�",statusLine);
+ continue;
}
- if(statusLine.contains("SQ")){
+ Machine machine = this.machineService.getMachineBySendPathAnnotation(sendPathLine);
+ if(machine == null){
+ throw new ServiceException("鏍规嵁涓嬪彂璺緞鏈壘鍒扮▼搴忓搴旂殑鏈哄簥:"+sendPathLine);
+ }
+
+ if(statusLine.contains(AnnotationUtil.SQ)){
//璇曞垏
- programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);//,processEdition
- }else if(statusLine.contains("GH")){
- //鍥哄寲
- programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName);
- }else if(statusLine.contains("PL")){
- //鍋忕
+ programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);//TODO 杩橀渶鏍规嵁鏈哄簥缁勶紙濡備綍鑾峰彇锛熸牴鎹笅鍙戣矾寰勮幏鍙栨満搴婏紝杩涜�岃幏鍙栵級锛�,processEdition
+ }else if(statusLine.contains(AnnotationUtil.LG)){
+ //涓存椂鏇存敼鍗�
programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);
}else{
- //鏌ヨ鏄惁杞﹀簥锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊
- programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
- if(programPackageNode!=null){
- Machine machine = machineService.getByCode(programPackageNode.getMachineCode());
- String chechuangVal = paramService.turninngValue();
- if(StringUtils.equals(machine.getMachineSpec(),chechuangVal)){
- //杞﹀簥
- ProgramAnnotation pa = programAnnotationService.getProgramAnnotationFormat(machine.getControlSystem(),annotionDictList);
- statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);
- }
- }
+ throw new ServiceException("鐘舵�佹敞閲婁笉鍦ㄨ寖鍥村唴:"+statusLine+",浠呰瘯鍒囥�佷复鏃舵洿鏀瑰崟鍙互鍥炰紶");
}
if(programPackageNode != null) {
@@ -291,10 +267,7 @@
//鏍规嵁鍐呴儴鏂囦欢锛岃鍙栧拰鍒嗘瀽绋嬪簭鍖呭拰绋嬪簭鏂囦欢鏁版嵁
List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
for(String dir : dirList){
- String folderName = StringUtils.removeEnd(dir,"/");
-
- //PackageAndProcessEdition pkgAndEdition = folderName;//parseProgramPackageFromFolderName(folderName);
- String programPackageName = folderName; //pkgAndEdition.getProgramPackageName();
+ String programPackageName = StringUtils.removeEnd(dir,"/");
Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();
@@ -334,7 +307,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);
--
Gitblit v1.9.3