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/controller/NcNodeController.java |   68 +++++++++++++++++++++++++++++-----
 1 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
index d636152..8a64c8c 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java
@@ -1,15 +1,28 @@
 
 package org.springblade.mdm.program.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.enums.ParameterIn;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
+import org.springblade.mdm.basesetting.machine.vo.MachineQueryVO;
+import org.springblade.mdm.basesetting.machine.vo.MachineVO;
+import org.springblade.mdm.program.entity.NcProgram;
 import org.springblade.mdm.program.service.NcNodeService;
+import org.springblade.mdm.program.service.NcProgramService;
+import org.springblade.mdm.program.vo.NcNodeProgramQueryVO;
+import org.springblade.mdm.program.vo.NcNodeProgramVO;
 import org.springblade.mdm.program.vo.NcNodeVO;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 绋嬪簭鑺傜偣
@@ -23,29 +36,64 @@
 @Tag(name = "绋嬪簭鑺傜偣", description = "绋嬪簭鑺傜偣")
 @Slf4j
 public class NcNodeController {
-
+	private final NcProgramService ncProgramService;
 	private final NcNodeService ncNodeService;
 
 	/**
 	 * 鏂板
 	 */
 	@PostMapping("/save")
-	@Operation(summary = "鏂板", description = "鑺傜偣淇℃伅")
+	@Operation(summary = "鏂板鑺傜偣", description = "鑺傜偣淇℃伅,id淇濇寔绌�")
 	public R<Boolean> save(@RequestBody NcNodeVO vo) {
-
 		ncNodeService.saveNcCode(vo);
 		return R.<Boolean>status(true);
 	}
 
-	/**
-	 * 鏂板
-	 */
-	@PostMapping("/update")
-	@Operation(summary = "淇敼", description = "鑺傜偣淇℃伅")
-	public R<Boolean> update(@RequestBody NcNodeVO vo) {
 
-		ncNodeService.updateNcCode(vo);
+	@PostMapping("/update")
+	@Operation(summary = "淇敼鑺傜偣", description = "鑺傜偣淇℃伅,蹇呴』浼犲叆ID")
+	public R<Boolean> update(@RequestBody NcNodeVO vo) {
+		ncNodeService.updateNcNode(vo);
 		return R.<Boolean>status(true);
 	}
 
+	@PostMapping("/remove")
+	@Operation(summary = "鍒犻櫎鑺傜偣")
+	public R<Boolean> remove(Long id) {
+		ncNodeService.removeById(id);
+		return R.<Boolean>status(true);
+	}
+
+	@GetMapping("/lazy-list")
+	@Operation(summary = "鎳掑姞杞藉垪琛�", description = "绋嬪簭鐩綍鏍戝舰缁撴瀯")
+	public R<List<NcNodeVO>> lazyList(Long parentId) {
+		List<NcNodeVO> list = ncNodeService.lazyList(parentId);
+		if(list != null && !list.isEmpty()) {
+			for(NcNodeVO ncNodeVO : list) {
+				if(!"70".equals(ncNodeVO.getNodeType())){
+					break;
+				}
+				NcProgram program = ncProgramService.getByBindNodeId(ncNodeVO.getId());
+				if(program != null) {
+					ncNodeVO.setProcessEdition(program.getProcessEdition());
+					ncNodeVO.setDrawingNo(program.getDrawingNo());
+					ncNodeVO.setMachineCode(program.getMachineCode());
+					ncNodeVO.setProcessName(program.getProcessName());
+					ncNodeVO.setVersionNumber(program.getVersionNumber());
+				}
+			}
+
+		}
+		return R.data(list);
+	}
+
+	/*
+	@Operation(summary = "绋嬪簭鍒嗛〉鏌ヨ", description = "鐢ㄤ簬鍦ㄧ紪鍒惰妭鐐归�夋嫨娴佺▼瀵瑰簲鐨勭▼搴�")
+	@GetMapping("/programpickpage")
+	public R<IPage<NcNodeProgramVO>> page(NcNodeProgramQueryVO query) {
+		IPage<NcNodeProgramVO> pages = ncNodeService.programPageQuery(query);
+		return R.data(pages);
+	}
+*/
+
 }

--
Gitblit v1.9.3