From 3907579a69079b5ee462d17799e3995d9cd77fd4 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 17 九月 2025 21:54:38 +0800
Subject: [PATCH] 延时问题
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 86 +++++++++++++++++++++++++++----------------
1 files changed, 54 insertions(+), 32 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 54f57eb..62af8a0 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;
@@ -25,6 +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.*;
import org.springblade.mdm.program.vo.DncSendBackData;
import org.springblade.mdm.program.vo.DncSendBackFile;
import org.springblade.mdm.program.vo.ProgramAnnotation;
@@ -36,11 +38,13 @@
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;
@@ -60,9 +64,10 @@
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;
+
/**
* 鍋忕鍗曟枃浠舵湯灏剧殑妯″紡锛歅+鏁板瓧
*/
@@ -135,45 +140,60 @@
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 = "";
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);
+
+ AnnotationProperties defAnnoProperties =AnnotationProperties.getDefault();
+ String statusLine = FileContentUtil.readLineAt(bais,defAnnoProperties.getStatusLineIndex());//鐘舵�佹敞閲婅
+ bais.reset();
+ String sendPathLine = FileContentUtil.readLineAt(bais,defAnnoProperties.getSendPathLineIndex());//鐘舵�佹敞閲婅
+ bais.reset();
+
+
+ if(statusLine.contains("GH")){
+ //鍥哄寲锛屼笉搴斿洖浼狅紝蹇界暐
+ log.warn("鐘舵�亄},涓嶅簲鍥炰紶锛屽拷鐣�",statusLine);
+ continue;
+ }
+
+ Machine machine = this.machineService.getMachineBySendPathAnnotation(sendPathLine);
+ if(machine == null){
+ throw new ServiceException("鏍规嵁涓嬪彂璺緞鏈壘鍒扮▼搴忓搴旂殑鏈哄簥:"+sendPathLine);
+ }
+
if(statusLine.contains("SQ")){
//璇曞垏
- programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);
- }else if(statusLine.contains("GH")){
- //鍥哄寲
- programPackageNode = ncNodeService.getLastEditionCuredProgramPackage(packageName,processEdition);
+ programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);//TODO 杩橀渶鏍规嵁鏈哄簥缁勶紙濡備綍鑾峰彇锛熸牴鎹笅鍙戣矾寰勮幏鍙栨満搴婏紝杩涜�岃幏鍙栵級锛�,processEdition
}else if(statusLine.contains("PL")){
//鍋忕
- programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName,processEdition);
+ programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName);
}else{
- //鏌ヨ鏄惁杞﹀簥锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊
- programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);
- 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);
- }else {
- //闈炶溅搴婃棤鐘舵�侊紝鐩存帴鎶ラ敊
- throw new ServiceException("鏈壘鍒扮▼搴忔枃浠朵腑鐨勭姸鎬佹敞閲�");
+ //鏌ヨ鏄惁杞﹀簥/鐜板満缂栧埗锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊锛�
+ //TODO 鐜板満缂栧埗鐨勭▼搴忥紝鎵撳寘鏃跺繀椤诲湪鏂囦欢涓鍔犱笅鍙戣矾寰勶紙鍔犲叆鍚庯級
+ programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
+ if(programPackageNode!=null){
+ String chechuangVal = paramService.turninngValue();
+ if(StringUtils.equals(machine.getMachineSpec(),chechuangVal)){
+ //杞﹀簥
+ ProgramAnnotation pa = AnnotationUtil.getProgramAnnotationFormat(machine.getControlSystem(),annotionDictList);
+ statusLine = pa.addAnnotation(ProgramAnnotationService.SQ);
+ }
}
}
+
if(programPackageNode != null) {
progData.setId(programPackageNode.getId());
progData.setProgramNo(programPackageNode.getProgramNo());
@@ -190,10 +210,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+"鍖呬笅鏈壘鍒版枃浠�");
}
}
@@ -207,10 +227,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);
@@ -221,7 +241,7 @@
result.setProgramPackageName(packageName);
result.setProcessEdition(processEditon);
return result;
- }
+ }*/
/**
* 鍏ュ簱鍥炰紶鏂囦欢,骞跺惎鍔ㄥ浐鍖栨祦绋�
@@ -269,11 +289,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();
@@ -417,4 +436,7 @@
private String programPackageName;
private String processEdition;
+ public String programName(){
+ return programPackageName+"-"+processEdition;
+ }
}
--
Gitblit v1.9.3