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 | 64 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 23 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 fcac854..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
@@ -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;
@@ -23,6 +24,7 @@
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.utils.EntityUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +65,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灏忔椂杩囨湡
@@ -103,9 +112,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 +123,8 @@
progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
progData.setProgramNo(programPackageNode.getProgramNo());
list.add(progData);
- //}
+ }
+
}
}
@@ -180,37 +191,42 @@
for(String dir : dirList){
String programPackageName = StringUtils.removeEnd(dir,"/");
- NcNode oriProgramPkg = this.ncNodeService.getLastEditionProgramPackage(programPackageName);
- if(oriProgramPkg == null){
+ NcNode tryProgramPkg = this.ncNodeService.getLastEditionTryingProgramPackage(programPackageName);
+ NcNode curedProgramPkg = ncNodeService.getLastEditionCuredProgramPackage(programPackageName);
+ if(curedProgramPkg != null){
+ throw new ServiceException(programPackageName+"宸茬粡鍥哄寲锛岃鍕块噸澶嶅叆搴撱��");
+ }
+ 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+"姝ｅ湪瀹℃壒涓紝璇峰嬁閲嶅鍏ュ簱銆�");
}
+ /*
if(oriProgramPkg.hasCured()){
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);
- clearBaseProperties(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<>();
@@ -220,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;
@@ -228,7 +244,7 @@
NcNode newProgramNode = new NcNode();
BeanUtils.copyProperties(oldProgramNode, newProgramNode);
- clearBaseProperties(newProgramNode);
+ EntityUtil.clearBaseProperties(newProgramNode);
newProgramNode.setIsLastEdition(1);
newProgramNode.setParentId(newProgramPkg.getId());
newProgramNode.setParentIds(newProgramPkg.getParentIds()+","+newProgramPkg.getId());
@@ -237,10 +253,10 @@
FlowProgramFile oldFlowFile = flowProgramFileService.getById(newProgramNode.getFlowProgramFileId());
- FlowProgramFile newFlowFile = new FlowProgramFile();//TODO
+ FlowProgramFile newFlowFile = new FlowProgramFile();
BeanUtils.copyProperties(oldFlowFile, newFlowFile);
newFlowFile.setProcessInstanceId(null);
- clearBaseProperties(newFlowFile);
+ EntityUtil.clearBaseProperties(newFlowFile);
try {
InputStream ins = zipFile.getInputStream(zipFile.getEntry(entryName));
@@ -252,9 +268,11 @@
newProgramNode.setFlowProgramFile(newFlowFile);
newProgramNode.setVersionNumber(oldProgramNode.genNewVersionNumber());
newProgramNodes.add(newProgramNode);
- oldProgramNode.setIsLastEdition(0);
- oldProgramNode.setIsLocked(1);
- ncNodeService.updateById(oldProgramNode);
+ //鏃ц妭鐐瑰鐞嗭紝鍜嬪姙锛熷鏋滃鍑哄伐鎺х綉 閲嶅瀵煎嚭鍛紵锛宨sLastEdition涓嶇敤璁剧疆浜嗭紝鍥犱负 绋嬪簭鍖呰妭鐐� 鏄柊鐨�
+ //TODO 寰呴獙璇�
+ //oldProgramNode.setIsLastEdition(鍘熸潵鏄�0);
+ //oldProgramNode.setIsLocked(1);
+ //ncNodeService.updateById(oldProgramNode);
}
});
@@ -288,7 +306,7 @@
entity.setCreateUser(jsonObject.getLong("createUser"));
entity.setUpdateUser(jsonObject.getLong("updateUser"));
}
-
+ /*
void clearBaseProperties(BizEntity entity){
entity.setId(null);
entity.setCreateTime(null);
@@ -296,5 +314,5 @@
entity.setStatus(null);
entity.setCreateUser(null);
entity.setUpdateUser(null);
- }
+ }*/
}
--
Gitblit v1.9.3