From a5f944c2bc0107e5df936937f1c33e5e03eb8fed Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 06 九月 2025 19:15:48 +0800
Subject: [PATCH] 解锁增加解锁原因和展示
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 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..a9dfc6a 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
@@ -15,17 +15,22 @@
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.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;
@@ -36,7 +41,6 @@
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;
@@ -50,14 +54,14 @@
@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;
/**
* 鍋忕鍗曟枃浠舵湯灏剧殑妯″紡锛歅+鏁板瓧
*/
@@ -123,6 +127,7 @@
}
}
+ List<DictBiz> annotionDictList = programAnnotationService.getAnnotionDictList();
NcNode programPackageNode;
//鐩綍鍒楄〃锛屽嵆绋嬪簭鍖呭垪琛�
for(String entryName : dirEntryNameList){
@@ -137,7 +142,7 @@
}
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());
@@ -154,8 +159,19 @@
//鍋忕
programPackageNode =ncNodeService.getLastEditionDeviationProgramPackage(packageName,processEdition);
}else{
- throw new ServiceException("鏈壘鍒扮▼搴忔枃浠朵腑鐨勭姸鎬佹敞閲�");
+ //鏌ヨ鏄惁杞﹀簥锛屾槸杞﹀簥鍙互鏀捐繃锛屾寜璇曞垏澶勭悊
+ programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName,processEdition);
+ 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 +188,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+"鍖呬笅鏈壘鍒版枃浠�");
}
}
@@ -251,7 +267,6 @@
//鏍规嵁鍐呴儴鏂囦欢锛岃鍙栧拰鍒嗘瀽绋嬪簭鍖呭拰绋嬪簭鏂囦欢鏁版嵁
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);
@@ -357,6 +372,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 +404,7 @@
}
}
- return result;
+ return result;*/
}
}
--
Gitblit v1.9.3