From b3dce273095af1915541ecc3cd76b34eae6a2abc Mon Sep 17 00:00:00 2001
From: "fangfang.dong" <fangfang.dong@fit2cloud.com>
Date: Tue, 27 Jun 2023 10:24:47 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=8E=A5=E5=8F=A3sql=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=20/api/v1/assets/nodes/children/tree/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apps/assets/api/tree.py | 9 ++++++---
apps/assets/models/node.py | 12 ------------
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/apps/assets/api/tree.py b/apps/assets/api/tree.py
index 794e093b7..1970d33ba 100644
--- a/apps/assets/api/tree.py
+++ b/apps/assets/api/tree.py
@@ -127,10 +127,13 @@ class NodeChildrenAsTreeApi(SerializeToTreeNodeMixin, NodeChildrenApi):
if not self.instance or not include_assets:
return Asset.objects.none()
if query_all:
- assets = self.instance.get_all_assets_for_tree()
+ assets = self.instance.get_all_assets()
else:
- assets = self.instance.get_assets_for_tree()
- return assets
+ assets = self.instance.get_assets()
+ return assets.only(
+ "id", "name", "address", "platform_id",
+ "org_id", "is_active", 'comment'
+ ).prefetch_related('platform')
def filter_queryset_for_assets(self, assets):
search = self.request.query_params.get('search')
diff --git a/apps/assets/models/node.py b/apps/assets/models/node.py
index 3a729ba9f..94ff9aba5 100644
--- a/apps/assets/models/node.py
+++ b/apps/assets/models/node.py
@@ -429,18 +429,6 @@ class NodeAssetsMixin(NodeAllAssetsMappingMixin):
assets = Asset.objects.filter(nodes=self)
return assets.distinct()
- def get_assets_for_tree(self):
- return self.get_assets().only(
- "id", "name", "address", "platform_id",
- "org_id", "is_active"
- ).prefetch_related('platform')
-
- def get_all_assets_for_tree(self):
- return self.get_all_assets().only(
- "id", "name", "address", "platform_id",
- "org_id", "is_active"
- ).prefetch_related('platform')
-
def get_valid_assets(self):
return self.get_assets().valid()