From 26f07223e1b33a8eb5ee184041575e9b204cfebe Mon Sep 17 00:00:00 2001 From: yangys <y_ys79@sina.com> Date: 星期五, 27 六月 2025 23:26:44 +0800 Subject: [PATCH] 上传程序文件 --- blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 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..50aaa5b 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,12 +1,17 @@ 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.NcNodeVO; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -29,10 +34,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 +62,7 @@ ncNode.setNodeType(vo.getNodeType()); ncNode.setDescription(vo.getDescription()); ncNode.setRemark(vo.getRemark()); + ncNode.setMachineCode(vo.getMachineCode()); this.updateById(ncNode); } @@ -59,4 +79,23 @@ return baseMapper.lazyList(parentId); } + + /** + * 绋嬪簭鑺傜偣 + * @param query + * @return + */ + public IPage<NcNodeProgramVO> programPageQuery(NcNodeProgramQueryVO query) { + return this.getBaseMapper().programPageQuery(Condition.getPage(query),query); + } + + /** + * 鏌ヨ鐜版湁鍥哄寲鐨勭▼搴忥紝鏆傚畾鏉′欢锛氶浂缁勪欢鍙风浉鍚岋紝涓旀槸鍚屼竴鏈哄簥缁� + * * @param name 绋嬪簭鍚嶇О + * @param name + * @return + */ + public NcNode getLastProgramNode(String name) { + return this.getBaseMapper().getLastProgramNode(name); + } } -- Gitblit v1.9.3