增加工控网树查询接口

yangys

2025-08-23 77461af6ea87f73b2273739ac7dfcd468251da5d

增加工控网树查询接口

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/controller/ProgramNodeController.java

@@ -42,4 +42,11 @@
        return R.data(list);
    }

    @GetMapping("/search-tree")
    @Operation(summary = "工控网tree", description = "工控网目录树形结构-全量")
    public R<List<String>> treeSearch(String keyword) {
        List<String> list = programNodeService.treeSearch(keyword);
        return R.data(list);
    }

}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/gkw/programnode/service/ProgramNodeService.java

@@ -123,4 +123,15 @@

        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();
    }
}

 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/service/NcNodeService.java

@@ -96,28 +96,6 @@
        return this.getBaseMapper().getLastProgramNode(name);
    }


    /**
     * 车讯节点
     * @param queryVO
     * @return
     */
    /*
    public List<Long> searchDrawing(NcNodeQueryVO queryVO) {
        List<NcNode> nodes = lambdaQuery().eq(NcNode::getNodeType,NcNode.TYPE_DRAWING_NO)
            .eq(NcNode::getIsLastEdition,1)
            .eq(NcNode::getName,queryVO.getDrawingNo())
            .ge(queryVO.getCreateTimeBegin()!=null,NcNode::getCreateTime,queryVO.getCreateTimeBegin())
            .le(queryVO.getCreateTimeEnd()!=null,NcNode::getCreateTime,queryVO.getCreateTimeEnd())
            .and(i->{

                i.or().likeRight(queryVO.getProgramStatus().contains("1"),NcNode::getParentIds,"0,1,");
                i.or().likeRight(queryVO.getProgramStatus().contains("2"),NcNode::getParentIds,"0,2,");
                i.or().likeRight(queryVO.getProgramStatus().contains("3"),NcNode::getParentIds,"0,3,");
            }).list();

        return nodes.stream().map(NcNode::getId).toList();
    }*/
    /**
     * 首页树查询
     * @param queryVO
@@ -201,24 +179,6 @@
                addNodeChildren(child, allNodes);
            }
        }
    }


    /**
     * 获取程序包名的数据
     * @param programName 程序名称（程序包名）
     * @return 程序报包名的节点
     */
    public NcNode getProgramPackageByName(String programName) {
        List<NcNode> pkgs = this.lambdaQuery().eq(NcNode::getName, programName)
            .eq(NcNode::getIsLastEdition,1)
            .eq(NcNode::getNodeType,NcNode.TYPE_PROGRAM_PACKAGE).list();
        if(pkgs.isEmpty()){
            return null;
        }else{
            return pkgs.get(0);
        }

    }

    /**