From b7af95d487f49490de16f9636147e5a40911e157 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 29 八月 2025 23:36:48 +0800
Subject: [PATCH] 确认表增加程序编号
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java
index 80dfa5a..97acf15 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java
@@ -66,7 +66,7 @@
ProgramNodeVO node = new ProgramNodeVO();
node.setId(String.valueOf(workshop.getId()));
node.setName(workshop.getDeptName());
-
+ node.setNodeType("workshop");
roots.add(node);
//鍔犲叆杞﹂棿涓嬬殑宸ユ
@@ -77,7 +77,7 @@
nodeGd.setId(String.valueOf(gd.getId()));
nodeGd.setName(gd.getDeptName());
nodeGd.setParentId(gd.getParentId());
-
+ nodeGd.setNodeType("seg");
node.addChildren(nodeGd);
//鍔犲叆宸ユ涓嬬殑鏈哄簥
@@ -86,6 +86,7 @@
nodeMachine.setName(machine.getCode());
nodeMachine.setId(String.valueOf(machine.getId()));
nodeMachine.setMachineCode(machine.getCode());
+ nodeMachine.setNodeType("machine");
addFolderNodes(nodeMachine);
nodeGd.addChildren(nodeMachine);
@@ -107,6 +108,7 @@
sendNode.setName("SEND");
sendNode.setMachineCode(nodeMachine.getMachineCode());
sendNode.setDirType(MachineFile.DIR_TYPE_SEND);
+ sendNode.setNodeType("dir");
//sendNode.setParentId(nodeMachine.getId());
ProgramNodeVO recNode = new ProgramNodeVO();
@@ -114,13 +116,25 @@
recNode.setName("REC");
recNode.setMachineCode(nodeMachine.getMachineCode());
recNode.setDirType(MachineFile.DIR_TYPE_REC);
+ recNode.setNodeType("dir");
ProgramNodeVO tempNode = new ProgramNodeVO();
tempNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_TEMP);
tempNode.setName("TEMP");
tempNode.setMachineCode(nodeMachine.getMachineCode());
tempNode.setDirType(MachineFile.DIR_TYPE_TEMP);
-
+ tempNode.setNodeType("dir");
nodeMachine.setChildren(Arrays.asList(sendNode,recNode,tempNode));
}
+
+ /**
+ * 鏍戞煡璇�
+ * @param keyword 鍏抽敭瀛�
+ * @return 鎼滅储閬撳痉鏈哄櫒鍒楄〃
+ */
+ public List<String> treeSearch(String keyword) {
+ return machineService.lambdaQuery()
+ .like(Machine::getCode,keyword)
+ .list().stream().map(m -> {return Func.toStr(m.getId());}).toList();
+ }
}
--
Gitblit v1.9.3