From 785f3d5be63e723a947a2b35dc0ca89297073d7f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 09 七月 2025 00:38:11 +0800
Subject: [PATCH] 接口文档描述修改
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java | 7 +++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java | 2 +-
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java | 18 ++++++++++++++++++
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/controller/NcNodeController.java | 19 ++++++++++++++++++-
4 files changed, 44 insertions(+), 2 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 bd6f030..824c5e3 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
@@ -14,7 +14,9 @@
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;
@@ -34,7 +36,7 @@
@Tag(name = "绋嬪簭鑺傜偣", description = "绋嬪簭鑺傜偣")
@Slf4j
public class NcNodeController {
-
+ private final NcProgramService ncProgramService;
private final NcNodeService ncNodeService;
/**
@@ -66,6 +68,21 @@
@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());
+ }
+ }
+
+ }
return R.data(list);
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
index 2739a5b..cf73928 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/entity/NcProgram.java
@@ -46,7 +46,7 @@
/**
* 宸ュ簭锛屽鈥滅簿閾ｂ��
*/
- //private String processName;
+ private String processName;
/**
* 澶囨敞
*/
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
index f41b3e9..7b60fa7 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcProgramService.java
@@ -62,6 +62,7 @@
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.List;
+import java.util.Optional;
/**
* 宸ヤ綔娴佹湇鍔″疄鐜扮被
@@ -139,6 +140,7 @@
prog.setProcessEdition(uploadVO.getProcessEdition());
prog.setIsLastEdition(1);
prog.setMachineCode(uploadVO.getMachineCode());
+ prog.setProcessName(uploadVO.getProcessName());
boolean isTextFile = false;
try {
isTextFile = FileContentUtil.isTextFile(file.getInputStream());
@@ -297,4 +299,20 @@
return dirPath+File.separator+prog.getName();
}
+
+ /**
+ *
+ * @param bindNcNodeId
+ * @return
+ */
+ public NcProgram getByBindNodeId(Long bindNcNodeId) {
+
+ LambdaQueryWrapper<NcProgram> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(NcProgram::getBindNcNodeId, bindNcNodeId);
+ wrapper.eq(NcProgram::getIsLastEdition,1);
+
+ Optional<NcProgram> progOpt = this.getOneOpt(wrapper);
+
+ return progOpt.orElse(null);
+ }
}
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java
index 9317ef7..d7651ce 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/vo/NcNodeVO.java
@@ -24,4 +24,11 @@
private String remark;
@Schema(description = "鍒涘缓鐢ㄦ埛鍚嶇О")
private String createUserName;
+
+ @Schema(description = "宸ュ簭锛屽鈥滅簿閾ｂ��,绋嬪簭鏂囦欢鑺傜偣鐨勫睘鎬�")
+ private String processName;
+ @Schema(description = "宸ュ簭鐗堟湰锛岀▼搴忔枃浠惰妭鐐圭殑灞炴��")
+ private String processEdition;
+ @Schema(description = "闆剁粍浠跺彿/鍥惧彿,绋嬪簭鏂囦欢鑺傜偣鐨勫睘鎬�")
+ private String drawingNo;
}
--
Gitblit v1.9.3