From 31ecdb8c700529a59dd762f0c47f0ed9c66d5092 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 25 九月 2025 20:40:07 +0800
Subject: [PATCH] 工控网任务
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 f1c5a49..a5c0091 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
@@ -4,9 +4,8 @@
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.mp.base.BizServiceImpl;
-import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
-import org.springblade.mdm.basesetting.machine.MachineService;
+import org.springblade.mdm.basesetting.machine.service.MachineService;
import org.springblade.mdm.basesetting.machine.entity.Machine;
import org.springblade.mdm.commons.contants.ParamConstants;
import org.springblade.mdm.commons.service.ParamService;
@@ -15,10 +14,7 @@
import org.springblade.mdm.gkw.programnode.entity.TreeDept;
import org.springblade.mdm.gkw.programnode.mapper.ProgramNodeMapper;
import org.springblade.mdm.gkw.programnode.vo.ProgramNodeVO;
-import org.springblade.system.feign.ISysClient;
-import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
import java.util.*;
@@ -57,17 +53,18 @@
*/
public List<ProgramNodeVO> loadTree(String includeSend) {
- Integer workshoptDictVal = Func.toInt(paramService.getParamValue(ParamConstants.WORKSHOP_DICT_KEY,DEFAULT_WORKSHOP_VALUE));
- Long rootDeptId = Func.toLong(paramService.rootDetpId());
+ Integer workshopDictVal = Func.toInt(paramService.getParamValue(ParamConstants.WORKSHOP_DICT_KEY,DEFAULT_WORKSHOP_VALUE));
+ Long rootDeptId = Func.toLong(paramService.rootDeptId());
TreeDept root = treeDeptService.getById(rootDeptId);
List<ProgramNodeVO> roots = new ArrayList<>();
ProgramNodeVO rootVO = new ProgramNodeVO();
rootVO.setNodeType("factory");
rootVO.setName(root.getDeptName());
rootVO.setId(rootVO.getId());
+ rootVO.setMachineCode("FAC_"+rootVO.getId());
roots.add(rootVO);
- List<TreeDept> workshops = treeDeptService.lambdaQuery().eq(TreeDept::getDeptCategory,workshoptDictVal)
+ List<TreeDept> workshops = treeDeptService.lambdaQuery().eq(TreeDept::getDeptCategory,workshopDictVal)
.orderByAsc(TreeDept::getSort).list();
List<ProgramNodeVO> workshopsVOList = new ArrayList<>();
@@ -76,6 +73,7 @@
node.setId(String.valueOf(workshop.getId()));
node.setName(workshop.getDeptName());
node.setNodeType("workshop");
+ node.setMachineCode("WS_"+node.getId());
// roots.add(node);
workshopsVOList.add(node);
//鍔犲叆杞﹂棿涓嬬殑宸ユ
@@ -87,6 +85,7 @@
nodeGd.setName(gd.getDeptName());
nodeGd.setParentId(gd.getParentId());
nodeGd.setNodeType("seg");
+ nodeGd.setMachineCode("SEG_"+nodeGd.getId());
node.addChildren(nodeGd);
//鍔犲叆宸ユ涓嬬殑鏈哄簥
@@ -129,15 +128,23 @@
ProgramNodeVO recNode = new ProgramNodeVO();
recNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_REC);
- recNode.setName("REC");
+ recNode.setName(MachineFile.DIR_TYPE_REC);
recNode.setMachineCode(nodeMachine.getMachineCode());
recNode.setDirType(MachineFile.DIR_TYPE_REC);
recNode.setNodeType("dir");
dirNodes.add(recNode);
+ ProgramNodeVO progNode = new ProgramNodeVO();
+ progNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_PROGRAM);
+ progNode.setName(MachineFile.DIR_TYPE_PROGRAM);
+ progNode.setMachineCode(nodeMachine.getMachineCode());
+ progNode.setDirType(MachineFile.DIR_TYPE_PROGRAM);
+ progNode.setNodeType("dir");
+ dirNodes.add(progNode);
+
ProgramNodeVO tempNode = new ProgramNodeVO();
tempNode.setId(nodeMachine.getId()+"_"+MachineFile.DIR_TYPE_TEMP);
- tempNode.setName("TEMP");
+ tempNode.setName(MachineFile.DIR_TYPE_TEMP);
tempNode.setMachineCode(nodeMachine.getMachineCode());
tempNode.setDirType(MachineFile.DIR_TYPE_TEMP);
tempNode.setNodeType("dir");
--
Gitblit v1.9.3