From e853c35455332a4652ec604c650ca82c411c864d Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 13 九月 2025 15:24:46 +0800
Subject: [PATCH] 流程常量位置重构
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 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..01f6c61 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;
@@ -71,8 +68,6 @@
private final ParamService paramService;
private final MachineAnnotationConfig machineAnnotationConfig;
- private final FanucProcessor fanucProcessor;
- private final DefaultProcessor defaultProcessor;
/**
* 鍋忕鍗曟枃浠舵湯灏剧殑妯″紡锛歅+鏁板瓧
*/
@@ -161,36 +156,30 @@
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();
+ 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;
- }
if(statusLine.contains("SQ")){
//璇曞垏
- programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);//,processEdition
+ programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);//TODO 杩橀渶鏍规嵁鏈哄簥缁勶紙濡備綍鑾峰彇锛熸牴鎹笅鍙戣矾寰勮幏鍙栨満搴婏紝杩涜�岃幏鍙栵級锛�,processEdition
}else if(statusLine.contains("GH")){
- //鍥哄寲
+ //TODO 鍥哄寲锛屾牴鏈笉闇�瑕佸洖浼狅紝搴旇鎻愮ず鎶ラ敊銆傛垨鑰呬笉杩涘叆鍒楄〃锛屾垨鍒楄〃涓笉鍙�夊垯鍏ュ簱
programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName);
}else if(statusLine.contains("PL")){
//鍋忕
programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);
}else{
- //鏌ヨ鏄惁杞﹀簥锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊
+ //鏌ヨ鏄惁杞﹀簥/鐜板満缂栧埗锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊锛�
+ //TODO 鐜板満缂栧埗鐨勭▼搴忥紝鎵撳寘鏃跺繀椤诲湪鏂囦欢涓鍔犱笅鍙戣矾寰勶紙鍔犲叆鍚庯級
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);
+ ProgramAnnotation pa = AnnotationUtil.getProgramAnnotationFormat(machine.getControlSystem(),annotionDictList);
statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);
}
}
--
Gitblit v1.9.3