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/programannotation/FanucProcessor.java | 30 ++++-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 98 ++++++++-----------
blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/contants/RegExpConstants.java | 3
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java | 24 +---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java | 16 ---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java | 16 ++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java | 2
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java | 7
blade-service/blade-mdm/src/test/java/org/springblade/mdm/commons/contants/RegExpConstantsTest.java | 38 +++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java | 26 +++++
11 files changed, 157 insertions(+), 105 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/contants/RegExpConstants.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/contants/RegExpConstants.java
index 01635f9..73b1bc8 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/contants/RegExpConstants.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/commons/contants/RegExpConstants.java
@@ -8,4 +8,7 @@
* 绋嬪簭鏂囦欢鍚� 姝ｅ垯
*/
public static final Pattern PROGRAM_FILE_PATTERN = Pattern.compile("^[0-9a-zA-Z_\\-]+\\-[0-9a-zA-Z]+-[0-9a-zA-Z]+\\-\\d+\\-\\d+\\.*[a-zA-Z]*$");
+
+ //public static final Pattern PROGRAM_PACKAGE_PATTERN = Pattern.compile("[\\w\\-]+\\-\\w+\\-\\w+");
+ public static final Pattern PROGRAM_PACKAGE_PATTERN = Pattern.compile("([\\w\\-]+)\\-\\w+\\-\\w+");
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
index 505c233..685ec8e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/excution/StartDispatcher.java
@@ -131,7 +131,7 @@
if(vars.getOrDefault(FlowVariableConstant.IS_TEMP_FLOW, FlowConstant.N).equals(FlowConstant.Y)){
myProcessName = "璇曞垏琛ュ厖娴佺▼";
}else if(StringUtils.isNotBlank(startVO.getDeviation()) ){
- myProcessName = "鍋忕鍗�";
+ myProcessName = "涓存椂鏇存敼鍗�";
}else if(vars.getOrDefault(FlowVariableConstant.HAS_CURED_PROGRAM, FlowConstant.N).equals(FlowConstant.Y)){
myProcessName = "鍥哄寲涓嬪彂娴佺▼";
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
index 799bb13..1bf86f9 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/TaskDispatchService.java
@@ -4,12 +4,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BizServiceImpl;
import org.springblade.mdm.commons.service.ParamService;
import org.springblade.mdm.flow.entity.TaskDispatch;
import org.springblade.mdm.flow.mapper.TaskDispatchMapper;
import org.springblade.mdm.flow.vo.TaskAssignVO;
import org.springblade.mdm.program.entity.DrawingNos;
+import org.springblade.mdm.program.entity.NcNode;
+import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.mapper.DrawingNosMapper;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -134,7 +137,30 @@
return opt.orElse(null);
}
+ /**
+ * 鏍规嵁绋嬪簭鍐呴儴缂栧彿鑾峰彇瀹炰綋
+ * @param programNo 鍐呴儴缂栧彿
+ * @return 瀹炰綋
+ */
public TaskDispatch getByProgramNo(String programNo) {
return lambdaQuery().eq(TaskDispatch::getProgramNo, programNo).one();
}
+
+
+ /**
+ * 鏌ヨ鍋忕鍗曠殑搴忓彿
+ * @param programNo 鍋忕鍗曠殑绋嬪簭鍖呭悕鑺傜偣
+ * @return 搴忓彿
+ */
+ public long getDeviationSerial(String programNo) {
+ TaskDispatch dispatch = this.getByProgramNo(programNo);
+
+ return lambdaQuery()
+ .eq(TaskDispatch::getDrawingNo,dispatch.getDrawingNo())
+ .eq(TaskDispatch::getProcessNo,dispatch.getProcessNo())
+ .eq(TaskDispatch::getProcessEdition,dispatch.getProcessEdition())
+ .eq(TaskDispatch::getDeviation,dispatch.getDeviation())
+ .le(TaskDispatch::getCreateTime,dispatch.getCreateTime()) //鏃堕棿灏忎簬绛変簬褰撳墠鑺傜偣
+ .count();
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
index ba05c3c..4288c15 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/ReceiveFileCheckService.java
@@ -108,14 +108,22 @@
byteStream.reset();
//AnnotationProcessor processor = annoProcessHelper.getProcessor(machine.getControlSystem());
- String lgLine = FileContentUtil.readLineAt(byteStream,annoProps.getDeviationLineIndex());
- String textWithoutAnno = AnnotationUtil.removeAnnotation(machine.getControlSystem(),lgLine,programAnnotationService.getAnnotionDictList());
- String[] strArr = Func.split(textWithoutAnno,":");//涓存椂鏇存敼鍗曟槸鍐掑彿鍒嗛殧锛屽悗闈㈡槸鍗曞彿
+
+ String planStatusLine = AnnotationUtil.removeAnnotation(machine.getControlSystem(),FileContentUtil.readLineAt(byteStream,annoProps.getStatusLineIndex()),programAnnotationService.getAnnotionDictList());
+
+ String lgNo;//鏇存敼鍗曞彿
+ if(AnnotationUtil.LG.equals(planStatusLine)) {//鏄洿鏀瑰崟
+ String lgLine = FileContentUtil.readLineAt(byteStream, annoProps.getDeviationLineIndex());
+ lgNo = AnnotationUtil.removeAnnotation(machine.getControlSystem(), lgLine, programAnnotationService.getAnnotionDictList());
+ }else{
+ lgNo = null;
+ }
+
long progOnMachineCount = programOnMachineService.lambdaQuery()
.eq(ProgramOnMachine::getDrawingNo,progNameVO.getDrawingNo())
.eq(ProgramOnMachine::getProcessNo,progNameVO.getProcessNo())
.eq(ProgramOnMachine::getProcessEdition,progNameVO.getProcessEdition())
- .eq(strArr.length==2,ProgramOnMachine::getDeviation,strArr[1])//涓存椂鏇存敼鍗曞尮閰�
+ .eq(lgNo != null,ProgramOnMachine::getDeviation,lgNo)//涓存椂鏇存敼鍗曞尮閰�
.eq(ProgramOnMachine::getMachineCode,machineFile.getMachineCode()).count();
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;
}
}
+
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
index d34603f..25e96d7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/MdmProgramImportService.java
@@ -299,13 +299,15 @@
List<String> idList = Func.toStrList(ids);
String dictStr = bladeRedis.get(getFileKey());
+ if(dictStr == null){
+ throw new ServiceException("");
+ }
Path extractDir = Paths.get(dictStr);
List<MdmProgramImportVO> list = readTempDir(extractDir);
String destFileFull;
for(String str : idList){
- //System.out.println(str);
for(MdmProgramImportVO vo : list){
if(StringUtils.equals(vo.getFullPath(),str)){
destFileFull = vo.getSendPath()+File.separator+vo.getFilename();
@@ -324,8 +326,5 @@
}
}
-
}
-
-
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
index 61d99b9..22c012b 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeAutoCreateService.java
@@ -34,7 +34,7 @@
public static final String TRY_NAME = "璇曞垏";
public static final String CURE_NAME = "鍥哄寲";
- public static final String DEVIATION_NAME = "鍋忕";
+ public static final String DEVIATION_NAME = "涓存椂鏇存敼鍗�";
/**
* 鍒涘缓鏍戝埌鏈哄簥绾у埆
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java
index bc9dd16..9c1112e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeHisService.java
@@ -54,23 +54,7 @@
ncNodeService.deleteOldEditionNodeData();
}
- /**
- * 鏌ヨ鍋忕鍗曠殑搴忓彿
- * @param programPkgNode 鍋忕鍗曠殑绋嬪簭鍖呭悕鑺傜偣
- * @return 搴忓彿
- */
- public long getDeviationSerialForNode(NcNodeHis programPkgNode) {
- return lambdaQuery().eq(NcNodeHis::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
- .eq(NcNodeHis::getName,programPkgNode.getName())
- .eq(NcNodeHis::getDrawingNo,programPkgNode.getDrawingNo())
- .eq(NcNodeHis::getProcessNo,programPkgNode.getProcessNo())
- .eq(NcNodeHis::getProcessEdition,programPkgNode.getProcessEdition())
-
- .isNotNull(NcNodeHis::getDeviation)
- .le(NcNodeHis::getCreateTime,programPkgNode.getCreateTime()) //鏃堕棿灏忎簬绛変簬褰撳墠鑺傜偣
- .count();
- }
/**
* 鏌ヨ鑺傜偣鐨勫巻鍙插垪琛紙鑺傜偣鐨勪笂绾ц妭鐐光�濈▼搴忓寘鍚嶁�滃洜涓哄瓨鍦ㄥ涓増鏈紝鎵�浠ュ巻鍙茶褰曚篃闇�瑕佹牴鎹笉鍚岀増鏈▼搴忓寘鍚嶈繘琛屾煡璇級
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
index 463a443..38d1fcb 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramExportDNCService.java
@@ -16,6 +16,7 @@
import org.springblade.mdm.flow.constants.FlowConstant;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.FlowProgramFileService;
+import org.springblade.mdm.flow.service.TaskDispatchService;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.entity.NcNodeHis;
import org.springblade.mdm.program.entity.NcProgramApproved;
@@ -48,8 +49,10 @@
private final OssTemplate ossTemplate;
private final FlowProgramFileService flowProgramFileService;
private final HistoryService historyService;
-
+ private final TaskDispatchService taskDispatchService;
private final MachineAnnotationConfig annotationConfig;
+
+ private final AnnotationProcessorHelper annotationProcessorHelper;
/**
* 瀵煎嚭dnc鍘嬬缉鍖�
* @param approvedIdArray 寰呭鍑哄鎵硅〃id鏁扮粍
@@ -100,7 +103,6 @@
Machine machine = machineService.getByCode(packageNodeHis.getMachineCode());//绋嬪簭鍖呰妭鐐癸紝鑾峰彇娉ㄩ噴鐢�
- //List<NcNode> programNodes = ncNodeService.lambdaQuery().eq(NcNode::getIsLastEdition,1).eq(NcNode::getParentId, approved.getNcNodeId()).list();
List<NcNodeHis> programNodes = ncNodeHisService.lambdaQuery().eq(NcNodeHis::getParentId, approved.getNcNodeId()).list();
FlowProgramFile programFile;
@@ -113,10 +115,9 @@
}
long deviationSerial = -1;//鍋忕鍗曞簭鍙� 锛�-1涓洪潪鍋忕鍗曪紝涓嶉渶瑕佸姞鍏�
if(packageNodeHis.isDeviationProgram()) {
- deviationSerial = ncNodeHisService.getDeviationSerialForNode(packageNodeHis);
+ deviationSerial = taskDispatchService.getDeviationSerial(packageNodeHis.getProgramNo());
}
- //List<DictBiz> annotationDictList= programAnnotationService.getAnnotionDictList();
for (NcNodeHis node : programNodes) {
String filePathInZip = genFilePathInZip(packageFolder,node,deviationSerial);
programFile = this.flowProgramFileService.getById(node.getFlowProgramFileId());
@@ -124,7 +125,8 @@
InputStream inputStream = ossTemplate.statFileStream(programFile.getOssName());
String sendDir = machine.getProgSendDir()==null? StringUtil.EMPTY:machine.getProgSendDir();
- AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(machine.getControlSystem(),annotationConfig);
+ //AnnotationProcessor annoProcessor = ProcessorHelper.getProcessor(machine.getControlSystem(),annotationConfig);
+ AnnotationProcessor annoProcessor = this.annotationProcessorHelper.getProcessor(machine.getControlSystem());
AnnotationData annoData = new AnnotationData();
annoData.setSendPath(sendDir);
annoData.setProgramStatus(status);
@@ -133,15 +135,7 @@
InputStream addedInsFinal = annoProcessor.putAnnotation(annoData,inputStream);
addedInsFinal.reset();
- /*
- InputStream addedInsFinal;
- InputStream addedIns2 = programAnnotationService.setSendDirAndStatusAnnotation(sendDir,status,inputStream,machine.getControlSystem());
- if(StringUtils.isNotBlank(programPackageNode.getDeviation())) {
- //鍋忕鍗曪紝澧炲姞鍋忕鍗曞彿
- addedInsFinal = programAnnotationService.setPldAnnotation(programPackageNode.getDeviation(),addedIns2, machine.getControlSystem(), annotationDictList);;
- }else{
- addedInsFinal = addedIns2;
- }*/
+
this.addInputStreamToZip(zipOut, addedInsFinal, filePathInZip);
}
}
@@ -152,7 +146,7 @@
* 鐢熸垚鍦▃ip涓殑鏂囦欢璺緞
* @param packageFolder zip涓殑鏂囦欢澶�
* @param programNode 绋嬪簭鑺傜偣
- * @param deviationSerial 鍋忕鍗曞簭鍙�
+ * @param deviationSerial 涓存椂鏇存敼鍗曞簭鍙�
* @return zip涓殑鏂囦欢璺緞
*/
String genFilePathInZip(String packageFolder,NcNodeHis programNode,long deviationSerial){
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/FanucProcessor.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/FanucProcessor.java
index 76e468e..b9b522e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/FanucProcessor.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/programannotation/FanucProcessor.java
@@ -19,27 +19,39 @@
@Autowired
private ProgramAnnotationService programAnnotationService;
private String controlSystem;
- private Pattern PATTERN = Pattern.compile("^[oO]\\d{4}");
- private final int O_LINE = 1;
+ static final Pattern PATTERN = Pattern.compile("^[oO]\\d{4}.*");
+ //private final int O_LINE = 1;
@Override
public InputStream putAnnotation(AnnotationData annoData, InputStream inputStream) throws IOException {
//鍦∣0001 杩欑鏂囧瓧鍚庨潰澧炲姞鏂囦欢鍚嶏紙涓嶅甫鎵╁睍鍚嶏級
- ByteArrayInputStream bais = new ByteArrayInputStream(IOUtils.toByteArray(inputStream));
- String line = FileContentUtil.readLineAt(bais,O_LINE);
- bais.reset();
+ ByteArrayInputStream byteStream = new ByteArrayInputStream(IOUtils.toByteArray(inputStream));
+ //String line = FileContentUtil.readLineAt(byteStream,O_LINE);
+ String line = FileContentUtil.readLineAt(byteStream,getAnnotationProperties().getProgramNameLineIndex());
+
+ byteStream.reset();
boolean oMatched = PATTERN.matcher(line).matches();
InputStream ins1;
if(oMatched){
List<DictBiz> annoDicts = programAnnotationService.getAnnotionDictList();
- String newline = line + AnnotationUtil.generateAnnotation(FilenameUtils.removeExtension(annoData.getFilename()),getControlSystem(),annoDicts);
- ins1 = FileContentUtil.replaceAtLine(bais,O_LINE,newline);
+
+ String programAnno = AnnotationUtil.generateAnnotation(FilenameUtils.removeExtension(annoData.getFilename()),getControlSystem(),annoDicts);
+
+ ins1 = FileContentUtil.replaceAtLine(byteStream,getAnnotationProperties().getProgramNameLineIndex(),genProgramNameLine(line,programAnno));
}else{
- ins1 = bais;
+ ins1 = byteStream;
}
return super.putAnnotation(annoData, ins1);
-
}
+ /**
+ * 鐢熸垚绋嬪簭鍚嶇О娉ㄩ噴琛岋紝O[4浣嶆暟瀛梋(绋嬪簭鍚�) 锛岄渶瑕佸皢鐢ㄦ埛鑷繁鐨勭▼搴忓悕鍘绘垨鍏朵粬娉ㄩ噴鎺夋斁鍚庨潰
+ * @param oriLine 鍘熷琛屾枃鏈�
+ * @param programNameAnno 绋嬪簭娉ㄩ噴鏂囨湰锛�(绋嬪簭鍚�)
+ * @return Oxxxx+绋嬪簭娉ㄩ噴鏂囨湰
+ */
+ String genProgramNameLine(String oriLine,String programNameAnno){
+ return oriLine.substring(0,5)+programNameAnno;
+ }
@Override
public void setControlSystem(String controlSystemDictVal) {
diff --git a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/commons/contants/RegExpConstantsTest.java b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/commons/contants/RegExpConstantsTest.java
index 9c76b11..96ebacf 100644
--- a/blade-service/blade-mdm/src/test/java/org/springblade/mdm/commons/contants/RegExpConstantsTest.java
+++ b/blade-service/blade-mdm/src/test/java/org/springblade/mdm/commons/contants/RegExpConstantsTest.java
@@ -47,4 +47,42 @@
m = RegExpConstants.PROGRAM_FILE_PATTERN.matcher("J_YDT290-10-02B-35-A-1-e.TXT");
Assertions.assertFalse(m.find());
}
+
+ @Test
+ public void testProgramPackagePattern(){
+ Matcher m = RegExpConstants.PROGRAM_PACKAGE_PATTERN.matcher("J_YDT290-10-02B-35-A");
+ Assertions.assertTrue(m.find());
+
+ m = RegExpConstants.PROGRAM_PACKAGE_PATTERN.matcher("J-YDT290-10-02B-35-A1");
+ Assertions.assertTrue(m.find());
+
+ m = RegExpConstants.PROGRAM_PACKAGE_PATTERN.matcher("CP3-1-1-1");
+ Assertions.assertTrue(m.find());
+
+ m = RegExpConstants.PROGRAM_PACKAGE_PATTERN.matcher("CP3-1-A-B");
+ Assertions.assertTrue(m.find());
+ m = RegExpConstants.PROGRAM_PACKAGE_PATTERN.matcher("CP3X296-A-B");
+ Assertions.assertTrue(m.find());
+
+
+ m = RegExpConstants.PROGRAM_PACKAGE_PATTERN.matcher("CP3X296-A-B");
+
+ String drawingNo = null;
+ if(m.find()) {
+ drawingNo = m.group(1);
+ Assertions.assertEquals("CP3X296",drawingNo );
+ }
+
+ String processNo = null;
+ if(m.find()) {
+ processNo = m.group(2);
+ Assertions.assertEquals("A",processNo );
+ }
+
+ String processEdition = null;
+ if(m.find()) {
+ processEdition = m.group(3);
+ Assertions.assertEquals("B",processEdition );
+ }
+ }
}
--
Gitblit v1.9.3