From dc01577b31204fd3c80645b45d81ff693f79a985 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 10 九月 2025 23:04:20 +0800
Subject: [PATCH] 程序包名增加版次
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 89 +++++++++++++++++++++++++++++++++-----------
1 files changed, 67 insertions(+), 22 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 aa96d07..e34f27a 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;
@@ -15,22 +16,32 @@
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.FileUtil;
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.commons.service.ParamService;
import org.springblade.mdm.flow.entity.FlowProgramFile;
import org.springblade.mdm.flow.service.CureFlowService;
import org.springblade.mdm.flow.service.FlowCommonService;
-import org.springblade.mdm.flow.service.FlowProgramFileService;
import org.springblade.mdm.program.entity.DncBackFile;
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.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.ZipTextFileContentUtil;
+import org.springblade.system.pojo.entity.DictBiz;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
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;
@@ -50,14 +61,18 @@
@AllArgsConstructor
public class DNCSendBackService extends BizServiceImpl<NcProgramExchangeMapper, NcProgramExchange> {
private final CureFlowService cureFlowService;
- private final FlowProgramFileService flowProgramFileService;
+ private final ProgramAnnotationService programAnnotationService;
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;
+ private final MachineAnnotationConfig machineAnnotationConfig;
+ private final FanucProcessor fanucProcessor;
+ private final DefaultProcessor defaultProcessor;
/**
* 鍋忕鍗曟枃浠舵湯灏剧殑妯″紡锛歅+鏁板瓧
*/
@@ -123,39 +138,64 @@
}
}
+ List<DictBiz> annotionDictList = programAnnotationService.getAnnotionDictList();
NcNode programPackageNode;
//鐩綍鍒楄〃锛屽嵆绋嬪簭鍖呭垪琛�
for(String entryName : dirEntryNameList){
DncSendBackData progData = new DncSendBackData();
String folderName = StringUtils.removeEnd(entryName,"/");
- PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
- String packageName = pkgAndEdition.getProgramPackageName();
- String processEdition = pkgAndEdition.getProcessEdition();
+ //PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
+ String packageName = folderName;//pkgAndEdition.getProgramPackageName();
+ //String processEdition = pkgAndEdition.getProcessEdition();
+ /*
if(StringUtils.isBlank(packageName) || StringUtils.isBlank(processEdition)){
- throw new ServiceException("鍖呭唴鏂囦欢澶瑰悕鏍煎紡閿欒搴旇涓篬闆剁粍浠跺彿-宸ュ簭鍙�-宸ュ簭鐗堟]:"+folderName);
- }
+ throw new ServiceException("鍖呭唴鏂囦欢澶瑰悕鏍煎紡閿欒锛屽簲璇ヤ负[闆剁粍浠跺彿-宸ュ簭鍙�-宸ュ簭鐗堟]:"+folderName);
+ }*/
progData.setProgramName(packageName);
- String statusLine = "";
+ 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()));
- statusLine = FileContentUtil.readLineAt(ins,2);
+ //machineAnnotationConfig.getConfigMap().get(machine.getcon)
+ Pattern fanucPattern = Pattern.compile("^[oO]\\d{4}");
+ String testLine = FileContentUtil.readLineAt(bais,2);//TODO,fanuc杩欒鏄笅鍙戣矾寰勶紝鍏朵粬鏈哄櫒鏄姸鎬�
+ 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);//,processEdition
}else if(statusLine.contains("GH")){
//鍥哄寲
- programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName,processEdition);
+ programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName);
}else if(statusLine.contains("PL")){
//鍋忕
- programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName,processEdition);
+ programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);
}else{
- throw new ServiceException("鏈壘鍒扮▼搴忔枃浠朵腑鐨勭姸鎬佹敞閲�");
+ //鏌ヨ鏄惁杞﹀簥锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊
+ 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);
+ }
+ }
}
+
if(programPackageNode != null) {
progData.setId(programPackageNode.getId());
progData.setProgramNo(programPackageNode.getProgramNo());
@@ -172,10 +212,10 @@
progData.setFiles(programFiles);
list.add(progData);
}else{
- throw new ServiceException("鎵句笉鍒扮▼搴忓寘鍚�:"+packageName+statusLine);
+ throw new ServiceException("鎵句笉鍒扮▼搴忓寘鍚�:"+packageName);
}
}else{
- throw new ServiceException(entryName+"鍖呬笅鏈壘鍒版枃浠�"+statusLine);
+ throw new ServiceException(entryName+"鍖呬笅鏈壘鍒版枃浠�");
}
}
@@ -189,10 +229,10 @@
* @param folderName 鏂囦欢澶瑰悕
* @return 缁撴瀯鏁版嵁
*/
+ /*
PackageAndProcessEdition parseProgramPackageFromFolderName(String folderName){
int index = StringUtils.lastIndexOf(folderName,'-');
String processEditon = "";
- String temp;
String packageName = "";
if(index != -1){
processEditon = folderName.substring(index+1);
@@ -203,7 +243,7 @@
result.setProgramPackageName(packageName);
result.setProcessEdition(processEditon);
return result;
- }
+ }*/
/**
* 鍏ュ簱鍥炰紶鏂囦欢,骞跺惎鍔ㄥ浐鍖栨祦绋�
@@ -251,11 +291,10 @@
//鏍规嵁鍐呴儴鏂囦欢锛岃鍙栧拰鍒嗘瀽绋嬪簭鍖呭拰绋嬪簭鏂囦欢鏁版嵁
List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
for(String dir : dirList){
- //String programPackageName1 = StringUtils.removeEnd(dir,"/");
String folderName = StringUtils.removeEnd(dir,"/");
- PackageAndProcessEdition pkgAndEdition = parseProgramPackageFromFolderName(folderName);
- String programPackageName = pkgAndEdition.getProgramPackageName();
+ //PackageAndProcessEdition pkgAndEdition = folderName;//parseProgramPackageFromFolderName(folderName);
+ String programPackageName = folderName; //pkgAndEdition.getProgramPackageName();
Optional<NcNode> optPackageNode = allAcceptPackages.stream().filter(node -> StringUtils.equals(node.getName(),programPackageName)).findFirst();
@@ -357,6 +396,9 @@
public String getEntryFileContent(String entryName) throws IOException {
String result = "";
String zipFileName = bladeRedis.get(getFileKey());
+ return ZipTextFileContentUtil.getTextContent(this.ossTemplate.statFileStream(zipFileName),entryName);
+
+ /*
try(InputStream inputStream = this.ossTemplate.statFileStream(zipFileName);){
Path tempZipFile = createTempFile(inputStream);
@@ -386,7 +428,7 @@
}
}
- return result;
+ return result;*/
}
}
@@ -396,4 +438,7 @@
private String programPackageName;
private String processEdition;
+ public String programName(){
+ return programPackageName+"-"+processEdition;
+ }
}
--
Gitblit v1.9.3