From ad90205fe702d0238983c693a8effe255c680f27 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 13 八月 2025 17:18:44 +0800
Subject: [PATCH] 机床回传文件导出开发
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 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 d60e7d7..80dfa5a 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
@@ -10,6 +10,7 @@
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.commons.contants.ParamConstants;
import org.springblade.mdm.commons.service.ParamService;
+import org.springblade.mdm.gkw.programnode.entity.MachineFile;
import org.springblade.mdm.gkw.programnode.entity.ProgramNode;
import org.springblade.mdm.gkw.programnode.entity.TreeDept;
import org.springblade.mdm.gkw.programnode.mapper.ProgramNodeMapper;
@@ -63,7 +64,7 @@
for(TreeDept workshop : workshops) {
ProgramNodeVO node = new ProgramNodeVO();
- node.setId(workshop.getId());
+ node.setId(String.valueOf(workshop.getId()));
node.setName(workshop.getDeptName());
roots.add(node);
@@ -73,7 +74,7 @@
.orderByAsc(TreeDept::getSort).list();
for(TreeDept gd : gongduanList){
ProgramNodeVO nodeGd = new ProgramNodeVO();
- nodeGd.setId(nodeGd.getId());
+ nodeGd.setId(String.valueOf(gd.getId()));
nodeGd.setName(gd.getDeptName());
nodeGd.setParentId(gd.getParentId());
@@ -82,9 +83,9 @@
//鍔犲叆宸ユ涓嬬殑鏈哄簥
machineService.lambdaQuery().eq(Machine::getOwnerDept,gd.getId()).list().forEach(machine -> {
ProgramNodeVO nodeMachine = new ProgramNodeVO();
- nodeMachine.setName(machine.getName());
- nodeMachine.setId(machine.getId());
-
+ nodeMachine.setName(machine.getCode());
+ nodeMachine.setId(String.valueOf(machine.getId()));
+ nodeMachine.setMachineCode(machine.getCode());
addFolderNodes(nodeMachine);
nodeGd.addChildren(nodeMachine);
@@ -102,19 +103,23 @@
void addFolderNodes(ProgramNodeVO nodeMachine){
ProgramNodeVO sendNode = new ProgramNodeVO();
+ sendNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_SEND);
sendNode.setName("SEND");
sendNode.setMachineCode(nodeMachine.getMachineCode());
- sendNode.setDirType("SEND");
+ sendNode.setDirType(MachineFile.DIR_TYPE_SEND);
+ //sendNode.setParentId(nodeMachine.getId());
ProgramNodeVO recNode = new ProgramNodeVO();
+ recNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_REC);
recNode.setName("REC");
recNode.setMachineCode(nodeMachine.getMachineCode());
- recNode.setDirType("REC");
+ recNode.setDirType(MachineFile.DIR_TYPE_REC);
ProgramNodeVO tempNode = new ProgramNodeVO();
+ tempNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_TEMP);
tempNode.setName("TEMP");
tempNode.setMachineCode(nodeMachine.getMachineCode());
- tempNode.setDirType("TEMP");
+ tempNode.setDirType(MachineFile.DIR_TYPE_TEMP);
nodeMachine.setChildren(Arrays.asList(sendNode,recNode,tempNode));
}
--
Gitblit v1.9.3