From 44b55dd34d09090fe6fdeb7d2428efe9e775424c Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 22:54:14 +0800
Subject: [PATCH] 增加流程文件下载接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 f6ab47a..5b6f68f 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
@@ -70,7 +70,7 @@
}
if(!StringUtils.endsWith(file.getOriginalFilename(),".zip")){
- throw new ServiceException("鏂囦欢蹇呴』涓簔ip鍖� ");
+ throw new ServiceException("鏂囦欢蹇呴』涓簔ip鍖�");
}
try {
BladeFile bfile = ossTemplate.putFile(file);//涓婁紶锛屼緵鍚庣画鍏ュ簱浣跨敤
@@ -191,18 +191,18 @@
for(String dir : dirList){
String programPackageName = StringUtils.removeEnd(dir,"/");
- NcNode oriProgramPkg = this.ncNodeService.getLastEditionTryingProgramPackage(programPackageName);
+ NcNode tryProgramPkg = this.ncNodeService.getLastEditionTryingProgramPackage(programPackageName);
NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(programPackageName);
if(curedProgramPkg != null){
throw new ServiceException(programPackageName+"宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
}
- if(oriProgramPkg == null){
+ if(tryProgramPkg == null){
log.warn("鏂囦欢澶规湭鍙戠幇鍖归厤鐨勭▼搴忓寘鍚峽}",dir);
continue;
}
//妫�鏌ユ槸鍚﹀湪瀹℃壒杩囩▼涓�
//鏍规嵁鑺傜偣淇℃伅鏌ヨ娴佺▼
- boolean active = flowCommonService.isProcessInstanceActive(oriProgramPkg.getProcessInstanceId());
+ boolean active = flowCommonService.isProcessInstanceActive(tryProgramPkg.getProcessInstanceId());
if(active){
throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁閲嶅鍏ュ簱銆�");
}
@@ -211,22 +211,22 @@
throw new ServiceException(programPackageName+"宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
}*/
- if(!programPackageIdList.contains(oriProgramPkg.getId())){
+ if(!programPackageIdList.contains(tryProgramPkg.getId())){
//涓嶅湪鍕鹃�夌殑鑼冨洿鍐�
log.info("{}涓嶅湪鍕鹃�夎寖鍥村唴",programPackageName);
continue;
}
NcNode newProgramPkg = new NcNode();
- BeanUtils.copyProperties(oriProgramPkg, newProgramPkg);
+ BeanUtils.copyProperties(tryProgramPkg, newProgramPkg);
EntityUtil.clearBaseProperties(newProgramPkg);
newProgramPkg.setIsLastEdition(1);
ncNodeService.save(newProgramPkg);
newProgramPackageNodeList.add(newProgramPkg);
//鏃ф暟鎹洿鏂颁负鑰佺増鏈�
- oriProgramPkg.setIsLocked(1);//鏃х増鑷姩閿佸畾
- oriProgramPkg.setIsLastEdition(0);;
- ncNodeService.updateById(oriProgramPkg);
+ tryProgramPkg.setIsLocked(1);//鏃х増鑷姩閿佸畾
+ tryProgramPkg.setIsLastEdition(0);;
+ ncNodeService.updateById(tryProgramPkg);
//List<FlowProgramFile> newFlowFiles = new ArrayList<>();
List<NcNode> newProgramNodes = new ArrayList<>();
@@ -236,7 +236,7 @@
if(!entryName.endsWith("/")){
//瀹為檯鐨勬枃浠�
String fileName = StringUtils.removeStart(entryName,dir);//鍘婚櫎鏂囦欢鍚嶈矾寰勯儴鍒�
- NcNode oldProgramNode = this.ncNodeService.getLastEditionProgramFile(fileName,oriProgramPkg.getId());
+ NcNode oldProgramNode = this.ncNodeService.getLastEditionProgramFile(fileName,tryProgramPkg.getId());
if(oldProgramNode == null){
log.info("{}鎵句笉鍒扮▼搴忔枃浠�",entryName);
return;
--
Gitblit v1.9.3