From c723796f39021476247cf1adf8dc587939c95535 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 09 八月 2025 12:46:54 +0800
Subject: [PATCH] 机床增加导入接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 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 18a6aa9..fdd4929 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
@@ -17,6 +17,7 @@
import org.springblade.core.tool.utils.Func;
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.NcNode;
import org.springblade.mdm.program.entity.NcProgramExchange;
@@ -50,6 +51,7 @@
private final NcNodeService ncNodeService;
private final OssTemplate ossTemplate;
private final BladeRedis bladeRedis;
+ private final FlowCommonService flowCommonService;
private String getFileKey(){
return "dncexpfile-"+ AuthUtil.getUserId();
@@ -69,7 +71,7 @@
InputStream zipFileInputStream = file.getInputStream();//test
//byte[] bytes = FileUtil.copyToByteArray(zipFileInputStream);
- list = parseDncZipFromByteArray(zipFileInputStream);
+ list = parseProgramListFromZip(zipFileInputStream);
} catch (IOException e) {
log.error("涓婁紶dnc鍥炰紶鏂囦欢澶辫触",e);
@@ -85,11 +87,10 @@
* @return 鍥炰紶绋嬪簭鍒楄〃
* @throws IOException 鏂囦欢鎿嶄綔寮傚父
*/
- List<DncSendBackData> parseDncZipFromByteArray(InputStream inputStream) throws IOException {
+ List<DncSendBackData> parseProgramListFromZip(InputStream inputStream) throws IOException {
List<DncSendBackData> list = new ArrayList<>();
Path tempZipFile = createTempFile(inputStream);
- //Map<String,String> fileMd5Map = new HashMap<>();
- Map<String,DncSendBackData> fileDataMap = new HashMap<>();
+
try (ZipFile zipFile = new ZipFile(tempZipFile.toFile())) {
ZipEntry entry;
@@ -102,16 +103,17 @@
//鐩綍锛屾墠鏄▼搴忓寘锛�
//鏌ヨ鏁版嵁搴擄紝瀵瑰簲涓婃墠鑳界‘璁ゆ椂鏈夋晥鐨勭▼搴忓寘
String packageName = StringUtils.removeEnd(entryName,"/");
- List<NcNode> pkgList = ncNodeService.lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).eq(NcNode::getName, packageName).eq(NcNode::getIsLastEdition,1).list();
- if(!pkgList.isEmpty()) {
- NcNode programPackageNode = pkgList.get(0);
+ NcNode programPackageNode = ncNodeService.getLastEditionTryingProgramPackage(packageName);
+ //List<NcNode> pkgList = ncNodeService.lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).eq(NcNode::getName, packageName).eq(NcNode::getIsLastEdition,1).list();
+ //if(!pkgList.isEmpty()) {
+ //NcNode programPackageNode = pkgList.get(0);
progData.setId(programPackageNode.getId());
progData.setProgramName(packageName);
progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
progData.setProgramNo(programPackageNode.getProgramNo());
list.add(progData);
- }
+ //}
}
}
@@ -130,11 +132,13 @@
List<Long> idList = Func.toLongList(ids);
//
NcProgramExchange exchange;
- String pkgFileName = bladeRedis.get(getFileKey());
+ String filekey = getFileKey();
+ String pkgFileName = bladeRedis.get(filekey);
+ log.info("filekey={},鏂囦欢鍚�={}",filekey,pkgFileName);
Map<Long,List<NcNode>> programPackageSubMap = new HashMap<>();
List<NcNode> newProgramPckageList = updateNodeDataByDNCBackData(pkgFileName,idList,programPackageSubMap);
-
+ log.info("闇�瑕佸惎鍔ㄥ浐鍖栨祦绋嬬殑绋嬪簭鍖呭悕鏁伴噺:{}",newProgramPckageList.size());
for(NcNode pkgNode :newProgramPckageList){
exchange = new NcProgramExchange();
exchange.setName(pkgNode.getName());
@@ -143,6 +147,9 @@
this.save(exchange);
}
+ bladeRedis.del(filekey);
+ this.ossTemplate.removeFile(pkgFileName);
+ log.info("鍒犻櫎oss鏂囦欢:{}",pkgFileName);
cureFlowService.startCure(newProgramPckageList,programPackageSubMap);
}
@@ -167,19 +174,30 @@
entry = entris.nextElement();
entryNameList.add(entry.getName());
}
-
+ log.info("allentrynames:{}",entryNameList);
//鏍规嵁鍐呴儴鏂囦欢锛岃鍙栧拰鍒嗘瀽绋嬪簭鍖呭拰绋嬪簭鏂囦欢鏁版嵁
List<String> dirList = entryNameList.stream().filter(s -> s.endsWith("/")).toList();
for(String dir : dirList){
String programPackageName = StringUtils.removeEnd(dir,"/");
- NcNode oriProgramPkg = this.ncNodeService.getLastEditionProgramPackage(programPackageName);
+
+ NcNode oriProgramPkg = this.ncNodeService.getLastEditionTryingProgramPackage(programPackageName);
if(oriProgramPkg == null){
- log.warn("鏈彂鐜板尮閰嶇殑绋嬪簭鍖呭悕{}",programPackageName);
+ log.warn("鏂囦欢澶规湭鍙戠幇鍖归厤鐨勭▼搴忓寘鍚峽}",dir);
continue;
+ }
+ //妫�鏌ユ槸鍚﹀湪瀹℃壒杩囩▼涓�
+ //鏍规嵁鑺傜偣淇℃伅鏌ヨ娴佺▼
+ boolean active = flowCommonService.isProcessInstanceActive(oriProgramPkg.getProcessInstanceId());
+ if(active){
+ throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁閲嶅鍏ュ簱銆�");
+ }
+ if(oriProgramPkg.hasCured()){
+ throw new ServiceException(programPackageName+"宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
}
if(!programPackageIdList.contains(oriProgramPkg.getId())){
//涓嶅湪鍕鹃�夌殑鑼冨洿鍐�
+ log.info("{}涓嶅湪鍕鹃�夎寖鍥村唴",programPackageName);
continue;
}
NcNode newProgramPkg = new NcNode();
@@ -244,6 +262,8 @@
}
}
+
+
return newProgramPackageNodeList;
}
--
Gitblit v1.9.3