From d36af1e4c9f7601b97dac825744a0df2b809f0b9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 06 八月 2025 17:02:19 +0800
Subject: [PATCH] 固化流程，建立node；OK
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 24 ++++++++++++++++--------
1 files changed, 16 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 8f87126..754378e 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,7 +87,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,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.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 = pkgList.get(0);
progData.setId(programPackageNode.getId());
progData.setProgramName(packageName);
progData.setFileBackTime(DateUtil.fromInstant(entry.getLastModifiedTime().toInstant()));
progData.setProgramNo(programPackageNode.getProgramNo());
list.add(progData);
- }
+ //}
}
}
@@ -179,10 +182,15 @@
NcNode oriProgramPkg = this.ncNodeService.getLastEditionProgramPackage(programPackageName);
if(oriProgramPkg == null){
- log.warn("鏈彂鐜板尮閰嶇殑绋嬪簭鍖呭悕{}",programPackageName);
+ log.warn("鏂囦欢澶规湭鍙戠幇鍖归厤鐨勭▼搴忓寘鍚峽}",dir);
continue;
}
-
+ //妫�鏌ユ槸鍚﹀湪瀹℃壒杩囩▼涓�
+ //鏍规嵁鑺傜偣淇℃伅鏌ヨ娴佺▼
+ boolean active = flowCommonService.isProcessInstanceActive(oriProgramPkg.getProcessInstanceId());
+ if(active){
+ throw new ServiceException(programPackageName+"姝ｅ湪瀹℃壒涓紝璇峰嬁閲嶅鍏ュ簱銆�");
+ }
if(!programPackageIdList.contains(oriProgramPkg.getId())){
//涓嶅湪鍕鹃�夌殑鑼冨洿鍐�
log.info("{}涓嶅湪鍕鹃�夎寖鍥村唴",programPackageName);
--
Gitblit v1.9.3