From 44fda5fa3787c78e74d62f9713dd36abdeadcac8 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 18 七月 2025 21:27:38 +0800
Subject: [PATCH] 上传接口调整
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
index 66fbc5b..4c76756 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
@@ -159,6 +159,10 @@
node.setDrawingNo(uploadVO.getDrawingNo());
node.setProcessName(uploadVO.getProcessName());
+ NcNode parentNode = nodeService.getById(uploadVO.getNodeId());
+ node.setParentIds(parentNode.getParentIds()+","+uploadVO.getNodeId());
+ //uploadVO.getre
+ //node.setDescription(uploadVO.getDrawingNo());
nodeService.save(node);
prog.setBindNcNodeId(node.getId());
@@ -244,15 +248,15 @@
/**
* 鍗囩増(鍗囩骇宸ュ簭鐗堟),鍗囩骇宸ュ簭鐗堟湰锛堝寘鎷▼搴忓拰鍏朵粬闄勪欢锛�
- * @param bindNodeid 绋嬪簭鏂囦欢缁戝畾鐨勮妭鐐筰d
+ * @param bindNcNodeId 绋嬪簭鏂囦欢缁戝畾鐨勮妭鐐筰d
* @param newProcessEdition 鏂扮増娆�
*/
- public void upgradeProcessEdition(long bindNcNodeid,String newProcessEdition) {
+ public void upgradeProcessEdition(Long bindNcNodeId,String newProcessEdition) {
//NcProgram prog = this.getById(id);
- NcProgram prog = getByBindNodeId(bindNcNodeid);
+ NcProgram prog = getByBindNodeId(bindNcNodeId);
//灏嗙幇鏈夌▼搴忔洿鏂颁负闈炴渶鏂扮増鏈�
- this.update(Wrappers.lambdaUpdate(NcProgram.class).eq(NcProgram::getBindNcNodeId,bindNcNodeid).set(NcProgram::getIsLastEdition,0));
+ this.update(Wrappers.lambdaUpdate(NcProgram.class).eq(NcProgram::getBindNcNodeId,bindNcNodeId).set(NcProgram::getIsLastEdition,0));
NcProgram newVerProg = new NcProgram();
BeanUtils.copyProperties(prog, newVerProg);
@@ -282,7 +286,8 @@
wrapper.eq(NcProgram::getBindNcNodeId, bindNcNodeId);
wrapper.eq(NcProgram::getIsLastEdition,1);
NcProgram prog = this.getOne(wrapper);
- String filePath = prog.getName();
+
+ String filePath = getFilePath(prog);
try(InputStream ins = ossTemplate.statFileStream(prog.getOssName());){
File targetFile = new File(filePath);
FileUtils.copyInputStreamToFile(ins, targetFile);
@@ -317,4 +322,46 @@
return progOpt.orElse(null);
}
+
+ /**
+ * 鏍规嵁绋嬪簭鍚嶇О鑾峰彇鏈�鏂扮殑绋嬪簭鏁版嵁
+ * @param name 绋嬪簭鍚嶇О
+ * @return
+ */
+ public NcProgram getByName(String name) {
+ LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(NcProgram::getName, name);
+ wrapper.eq(NcProgram::getIsLastEdition,1);
+ Optional<NcProgram> progOpt = this.getOneOpt(wrapper);
+
+ return progOpt.orElse(null);
+ }
+
+ /**
+ *
+ * @param nodeId 涓婄骇鑺傜偣id
+ * @param name 绋嬪簭鍚嶇О
+ */
+ public boolean programExistsUnderNode(Long nodeId, String name) {
+ LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(nodeId!=null,NcProgram::getNcNodeId, nodeId);
+ wrapper.eq(NcProgram::getName, name);
+ wrapper.eq(NcProgram::getIsLastEdition,1);
+
+ return this.count(wrapper)>0;
+ }
+
+ /**
+ *
+ * @param nodeId 涓婄骇鑺傜偣id
+ * @param name 绋嬪簭鍚嶇О
+ */
+ public boolean programExistsUnderOtherNode(Long nodeId, String name) {
+ LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
+ wrapper.ne(NcProgram::getNcNodeId, nodeId);
+ wrapper.eq(NcProgram::getName, name);
+ wrapper.eq(NcProgram::getIsLastEdition,1);
+
+ return this.count(wrapper)>0;
+ }
}
--
Gitblit v1.9.3