From b5b668d2728665ca05d15be8862ceb0a2796fc67 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 11 八月 2025 09:18:10 +0800
Subject: [PATCH] 增加替换文件上传
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 43 +++++++++++++++++++++++++++++++++++--------
1 files changed, 35 insertions(+), 8 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 8923526..dc105bc 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
@@ -2,6 +2,7 @@
package org.springblade.mdm.program.service;
import com.alibaba.fastjson.JSONObject;
+import io.netty.util.internal.StringUtil;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -17,6 +18,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 +52,7 @@
private final NcNodeService ncNodeService;
private final OssTemplate ossTemplate;
private final BladeRedis bladeRedis;
+ private final FlowCommonService flowCommonService;
private String getFileKey(){
return "dncexpfile-"+ AuthUtil.getUserId();
@@ -61,6 +64,13 @@
*/
public List<DncSendBackData> dncSendBackUpload(MultipartFile file) {
List<DncSendBackData> list;
+ if(file == null || file.isEmpty()){
+ throw new ServiceException("鏂囦欢涓虹┖");
+ }
+
+ if(!StringUtils.endsWith(file.getOriginalFilename(),".zip")){
+ throw new ServiceException("鏂囦欢蹇呴』涓簔ip鍖� ");
+ }
try {
BladeFile bfile = ossTemplate.putFile(file);//涓婁紶锛屼緵鍚庣画鍏ュ簱浣跨敤
//璁剧疆涓�涓紦瀛橈紝2灏忔椂杩囨湡
@@ -69,7 +79,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,7 +95,7 @@
* @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);
@@ -101,9 +111,11 @@
//鐩綍锛屾墠鏄▼搴忓寘锛�
//鏌ヨ鏁版嵁搴擄紝瀵瑰簲涓婃墠鑳界‘璁ゆ椂鏈夋晥鐨勭▼搴忓寘
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);
+ NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(packageName);
+
+ if(programPackageNode!=null && curedProgramPkg == null) {//鏃犲浐鍖栫▼搴忥紝鎵嶆斁鍏ュ垪琛�
+ //NcNode programPackageNode = pkgList.get(0);
progData.setId(programPackageNode.getId());
progData.setProgramName(packageName);
@@ -111,6 +123,7 @@
progData.setProgramNo(programPackageNode.getProgramNo());
list.add(progData);
}
+
}
}
@@ -171,17 +184,31 @@
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);
+ NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(programPackageName);
+ if(curedProgramPkg != null){
+ throw new ServiceException(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())){
//涓嶅湪鍕鹃�夌殑鑼冨洿鍐�
--
Gitblit v1.9.3