From 1130aee058b7f47f2df56ebd0e2934392102c354 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 04 八月 2025 18:01:58 +0800
Subject: [PATCH] 清除无用的显示ncprogram的内容代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 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 b1d2e8c..81ce4fb 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
@@ -109,10 +109,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()) {
- progData.setId(pkgList.get(0).getId());
+ NcNode programPackageNode = pkgList.get(0);
+ progData.setId(programPackageNode.getId());
progData.setProgramName(packageName);
progData.setFileBackTime(LocalDateTime.now());
- //progData.setProgramNo(pkgList.get(0).getCode());
+ progData.setProgramNo(programPackageNode.getProgramNo());
list.add(progData);
}
}
@@ -146,7 +147,7 @@
this.save(exchange);
}
- cureFlowService.startCure(pkgList);
+ //cureFlowService.startCure(pkgList);
}
/**
@@ -180,26 +181,46 @@
log.warn("鏈彂鐜板尮閰嶇殑绋嬪簭鍖呭悕{}",programPackageName);
continue;
}
+
+ if(!programPackageIdList.contains(oriProgramPkg.getId())){
+ //涓嶅湪鍕鹃�夌殑鑼冨洿鍐�
+ continue;
+ }
//涓存椂娴嬭瘯娉ㄩ噴
- /*
+
NcNode newProgramPkg = new NcNode();
BeanUtils.copyProperties(oriProgramPkg, newProgramPkg);
- newProgramPkg.setId(null);
+
+ clearBaseProperties(newProgramPkg);
newProgramPkg.setIsLastEdition(1);
- newProgramPkg.setCreateTime(null);
- newProgramPkg.setUpdateTime(null);
- newProgramPkg.setCreateUser(null);
- newProgramPkg.setUpdateUser(null);
ncNodeService.save(newProgramPkg);
//鏃ф暟鎹洿鏂颁负鑰佺増鏈�
oriProgramPkg.setIsLastEdition(0);;
- ncNodeService.save(oriProgramPkg);
- */
+ ncNodeService.updateById(oriProgramPkg);
+
//鏌ユ壘鍖呬笅鐨勬枃浠舵暟鎹�,
entryNameList.stream().filter(s -> s.startsWith(dir)).forEach(entryName -> {
- log.info(dir+"涓嬬殑鏂囦欢锛歿}",entryName);
+ log.info("{}涓嬬殑鏂囦欢锛歿}",dir,entryName);
+ if(!entryName.endsWith("/")){
+ //瀹為檯鐨勬枃浠�
+ String fileName = StringUtils.removeStart(entryName,dir);//鍘婚櫎鏂囦欢鍚嶈矾寰勯儴鍒�
+ NcNode oldProgramNode = this.ncNodeService.getLastEditionProgramFile(fileName,oriProgramPkg.getId());
+ if(oldProgramNode == null){
+ log.info("{}鎵句笉鍒扮▼搴忔枃浠�",entryName);
+ return;
+ }
+
+ NcNode newProgramNode = new NcNode();
+ BeanUtils.copyProperties(oriProgramPkg, newProgramNode);
+ clearBaseProperties(newProgramNode);
+ newProgramNode.setIsLastEdition(1);
+ ncNodeService.save(newProgramNode);
+
+ ncNodeService.updateById(oriProgramPkg);
+
+ }
});
}
@@ -214,4 +235,13 @@
entity.setCreateUser(jsonObject.getLong("createUser"));
entity.setUpdateUser(jsonObject.getLong("updateUser"));
}
+
+ void clearBaseProperties(BizEntity entity){
+ entity.setId(null);
+ entity.setCreateTime(null);
+ entity.setUpdateTime(null);
+ entity.setStatus(null);
+ entity.setCreateUser(null);
+ entity.setUpdateUser(null);
+ }
}
--
Gitblit v1.9.3