From dc9957bff8996ede10846df694fcb4c23a21dc25 Mon Sep 17 00:00:00 2001
From: xyli <dev12102@linx-info.com>
Date: Thu, 16 Feb 2023 16:52:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9NodeService.java=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0listAndProject=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/mpms/service/node/NodeService.java   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/main/java/mpms/service/node/NodeService.java b/src/main/java/mpms/service/node/NodeService.java
index 323ffba..18be9de 100644
--- a/src/main/java/mpms/service/node/NodeService.java
+++ b/src/main/java/mpms/service/node/NodeService.java
@@ -65,4 +65,33 @@ public class NodeService extends BaseOperService<NodeModel> implements BaseDynam
 		return hashSet;
 	}
 
+	/**
+	 * 获取所有节点 和节点下面的项目
+	 *
+	 * @return list
+	 */
+	public List<NodeModel> listAndProject() {
+		List<NodeModel> nodeModels = this.list();
+		Iterator<NodeModel> iterator = nodeModels.iterator();
+		while (iterator.hasNext()) {
+			NodeModel nodeModel = iterator.next();
+			if (!nodeModel.isOpenStatus()) {
+				iterator.remove();
+				continue;
+			}
+			try {
+				// 获取项目信息不需要状态
+				JSONArray jsonArray = NodeForward.requestData(nodeModel, NodeUrl.Manage_GetProjectInfo, JSONArray.class, "notStatus", "true");
+				if (jsonArray != null) {
+					nodeModel.setProjects(jsonArray);
+				} else {
+					iterator.remove();
+				}
+			} catch (Exception e) {
+				iterator.remove();
+			}
+		}
+		return nodeModels;
+	}
+
 }
-- 
Gitee