From 86d0a38916d2edb66e451c44f1f1b9729dee965b Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 25 七月 2025 15:02:04 +0800
Subject: [PATCH] 增加首页查询接口
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 98 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 98 insertions(+), 0 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 cee231b..e3c8dc6 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
@@ -1,17 +1,25 @@
package org.springblade.mdm.program.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BizServiceImpl;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
+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.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
* 绋嬪簭鑺傜偣
@@ -29,10 +37,24 @@
BeanUtils.copyProperties(vo, ncNode);
ncNode.setId(null);
+ ncNode.setParentIds(buildParentIds(vo.getParentId()));
this.save(ncNode);
}
+ /**
+ * 鏋勫缓鐖秈d鑺傜偣
+ * @param nodeId 鑺傜偣id
+ * @return
+ */
+ String buildParentIds(long nodeId){
+ if(nodeId == 0L){
+ return "0";
+ }
+ NcNode pNode = this.baseMapper.selectById(nodeId);
+
+ return pNode.getParentIds()+","+pNode.getId();
+ }
/**
* 鏇存柊鑺傜偣
* @param vo
@@ -43,6 +65,9 @@
ncNode.setNodeType(vo.getNodeType());
ncNode.setDescription(vo.getDescription());
ncNode.setRemark(vo.getRemark());
+ ncNode.setMachineCode(vo.getMachineCode());
+ ncNode.setParentIds(buildParentIds(vo.getParentId()));
+
this.updateById(ncNode);
}
@@ -59,4 +84,77 @@
return baseMapper.lazyList(parentId);
}
+
+
+ /**
+ * 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁�
+ * * @param name 绋嬪簭鍚嶇О
+ * @param name
+ * @return
+ */
+ public NcNode getLastProgramNode(String name) {
+ return this.getBaseMapper().getLastProgramNode(name);
+ }
+
+
+ /**
+ * 棣栭〉鏍戞煡璇�
+ * @param queryVO
+ * @return
+ */
+ public List<NcNodeVO> searchList(NcNodeQueryVO queryVO) {
+ //1.鏍规嵁鍏宠繘瀛楀拰鑺傜偣绫诲瀷鏌ヨ鍒濆鍒楄〃,鏌ヨ鐨勫師濮嬪垪琛紝闇�瑕乭asChild瀛楁锛屾墍浠ヤ娇鐢╩apper.xml
+ List<NcNodeVO> oriList = this.getBaseMapper().searchList(queryVO);
+ //List<NcNode> list = this.lambdaQuery().eq(NcNode::getNodeType, queryVO.getNodeType()).like(NcNode::getName, queryVO.getName()).list();
+ if ("10".equals(queryVO.getNodeType())) {
+ //鎼滅储鐨勬牴绾у埆锛岀洿鎺ヨ繑鍥�
+ return oriList;
+ }
+
+ List<NcNodeVO> allVos = new ArrayList<NcNodeVO>();//宸茬粡鍔犲叆杩囩殑鑺傜偣锛岀敤浜庡幓閲�
+ List<NcNodeVO> rootVos = new ArrayList<NcNodeVO>();
+
+ //List<NcNode> rootNodes = new ArrayList<>();
+
+ for(NcNodeVO vo : oriList){
+ allVos.add(vo);
+ //涓婄骇鍚勭骇鐨勮妭鐐�
+ List<NcNodeVO> parents = this.getBaseMapper().searchListInIds(Func.toLongList(vo.getParentIds()));
+
+ for(NcNodeVO pvo : parents){
+ if(pvo.getParentId() == 0L){
+ rootVos.add(pvo);
+ }
+ allVos.add(pvo);
+ }
+ }
+ for(NcNodeVO root : rootVos){
+ addNodeChildren(root, allVos);
+
+ }
+ return rootVos;
+ }
+
+ void addNodeChildren(NcNodeVO node, List<NcNodeVO> allNodes) {
+ for(NcNodeVO vo : allNodes){
+ if(Objects.equals(vo.getParentId(), node.getId())){
+ node.addChildren(vo);
+ }
+ }
+
+ if(node.getChildren()!=null && !node.getChildren().isEmpty()){
+ for(NcNodeVO child : node.getChildren()){
+ addNodeChildren(child, allNodes);
+ }
+ }
+ }
+
+ NcNodeVO toNodeVO(NcNode node){
+ NcNodeVO vo = new NcNodeVO();
+
+ BeanUtils.copyProperties(node, vo);
+
+ return vo;
+ }
+
}
--
Gitblit v1.9.3