From 4f91b953e8f0ae7c63aea01a57367b6b57639a7f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 05 八月 2025 10:58:52 +0800
Subject: [PATCH] 清除无用的显示ncprogram的内容代码
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
index e3c8dc6..2a337cd 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java
@@ -10,12 +10,10 @@
import org.springblade.mdm.basesetting.machine.vo.MachineVO;
import org.springblade.mdm.program.entity.NcNode;
import org.springblade.mdm.program.mapper.NcNodeMapper;
-import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
-import org.springblade.mdm.program.vo.NcNodeProgramVO;
-import org.springblade.mdm.program.vo.NcNodeQueryVO;
-import org.springblade.mdm.program.vo.NcNodeVO;
+import org.springblade.mdm.program.vo.*;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -157,4 +155,56 @@
return vo;
}
+ /**
+ * 鑾峰彇绋嬪簭鍖呭悕鐨勬暟鎹�
+ * @param programName 绋嬪簭鍚嶇О锛堢▼搴忓寘鍚嶏級
+ * @return 绋嬪簭鎶ュ寘鍚嶇殑鑺傜偣
+ */
+ public NcNode getProgramPackageByName(String programName) {
+ List<NcNode> pkgs = this.lambdaQuery().eq(NcNode::getName, programName).eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).list();
+ if(pkgs.isEmpty()){
+ return null;
+ }else{
+ return pkgs.get(0);
+ }
+
+ }
+
+ @Transactional(readOnly = true)
+ public List<NcNodeVO> historyByNodeId(Long id) {
+ NcNode node = this.getById(id);
+ return this.baseMapper.historyByParentIdAndName(node.getParentId(),node.getName());
+ }
+
+ /**
+ * 鑾峰彇鈥滅▼搴忓寘鍚嶁�濈殑鏈�鏂扮増鏈�
+ * @param name 鑺傜偣鍚嶇О
+ * @return 鏈�鏂扮増鏈▼搴忔姤鍚嶈妭鐐�
+ */
+ public NcNode getLastEditionProgramPackage(String name){
+ List<NcNode> pkgList = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE)
+ .eq(NcNode::getName, name).eq(NcNode::getIsLastEdition,1).orderByDesc(NcNode::getCreateTime).list();
+
+ if(pkgList.isEmpty()){
+ return null;
+ }else{
+ return pkgList.get(0);
+ }
+ }
+
+ /**
+ * 鏍规嵁鐖惰妭鐐瑰拰鍚嶇О锛屾煡璇㈡枃浠剁晫鑺傜偣鍒楄〃
+ * @param name 鑺傜偣/鏂囦欢鍚嶇О
+ * @param parentId 鐖惰妭鐐筰d
+ */
+ public NcNode getLastEditionProgramFile(String name,Long parentId) {
+ List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_FILE)
+ .eq(NcNode::getName, name).eq(NcNode::getParentId,parentId)
+ .eq(NcNode::getIsLastEdition,1).list();
+ if(nodes.isEmpty()){
+ return null;
+ }else {
+ return nodes.get(0);
+ }
+ }
}
--
Gitblit v1.9.3