From c32ee236fe0ae2f2c27503138160e93c2319bc56 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期日, 10 八月 2025 14:54:04 +0800
Subject: [PATCH] 调整回传文件查询
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 754378e..775e09c 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
@@ -103,9 +103,10 @@
//鐩綍锛屾墠鏄▼搴忓寘锛�
//鏌ヨ鏁版嵁搴擄紝瀵瑰簲涓婃墠鑳界‘璁ゆ椂鏈夋晥鐨勭▼搴忓寘
String packageName = StringUtils.removeEnd(entryName,"/");
- NcNode programPackageNode = ncNodeService.getLastEditionProgramPackage(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 = ncNodeService.getLastEditionTryingProgramPackage(packageName);
+ NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(packageName);
+
+ if(programPackageNode!=null && curedProgramPkg != null) {//鏃犲浐鍖栫▼搴忥紝鎵嶆斁鍏ュ垪琛�
//NcNode programPackageNode = pkgList.get(0);
progData.setId(programPackageNode.getId());
progData.setProgramName(packageName);
@@ -113,7 +114,8 @@
progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
progData.setProgramNo(programPackageNode.getProgramNo());
list.add(progData);
- //}
+ }
+
}
}
@@ -180,7 +182,11 @@
for(String dir : dirList){
String programPackageName = StringUtils.removeEnd(dir,"/");
- NcNode oriProgramPkg = this.ncNodeService.getLastEditionProgramPackage(programPackageName);
+ NcNode oriProgramPkg = this.ncNodeService.getLastEditionTryingProgramPackage(programPackageName);
+ NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(programPackageName);
+ if(curedProgramPkg != null){
+ throw new ServiceException(programPackageName+"宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
+ }
if(oriProgramPkg == null){
log.warn("鏂囦欢澶规湭鍙戠幇鍖归厤鐨勭▼搴忓寘鍚峽}",dir);
continue;
@@ -191,6 +197,11 @@
if(active){
throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁閲嶅鍏ュ簱銆�");
}
+ /*
+ if(oriProgramPkg.hasCured()){
+ throw new ServiceException(programPackageName+"宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
+ }*/
+
if(!programPackageIdList.contains(oriProgramPkg.getId())){
//涓嶅湪鍕鹃�夌殑鑼冨洿鍐�
log.info("{}涓嶅湪鍕鹃�夎寖鍥村唴",programPackageName);
--
Gitblit v1.9.3