From 2f7738d809f1b3e31ec61e97c7be974beda3be30 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 12 八月 2025 16:27:00 +0800
Subject: [PATCH] 新增文件编辑和保存接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/DNCSendBackService.java | 23 +++++++++++++----------
1 files changed, 13 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 4d443dc..f6ab47a 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
@@ -24,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;
@@ -68,7 +69,7 @@
throw new ServiceException("鏂囦欢涓虹┖");
}
- if(StringUtils.endsWith(file.getOriginalFilename(),".zip")){
+ if(!StringUtils.endsWith(file.getOriginalFilename(),".zip")){
throw new ServiceException("鏂囦欢蹇呴』涓簔ip鍖� ");
}
try {
@@ -217,7 +218,7 @@
}
NcNode newProgramPkg = new NcNode();
BeanUtils.copyProperties(oriProgramPkg, newProgramPkg);
- clearBaseProperties(newProgramPkg);
+ EntityUtil.clearBaseProperties(newProgramPkg);
newProgramPkg.setIsLastEdition(1);
ncNodeService.save(newProgramPkg);
newProgramPackageNodeList.add(newProgramPkg);
@@ -243,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());
@@ -252,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));
@@ -267,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);
}
});
@@ -303,7 +306,7 @@
entity.setCreateUser(jsonObject.getLong("createUser"));
entity.setUpdateUser(jsonObject.getLong("updateUser"));
}
-
+ /*
void clearBaseProperties(BizEntity entity){
entity.setId(null);
entity.setCreateTime(null);
@@ -311,5 +314,5 @@
entity.setStatus(null);
entity.setCreateUser(null);
entity.setUpdateUser(null);
- }
+ }*/
}
--
Gitblit v1.9.3