github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #10825 from jumpserver/pr@dev@perf_asset_node 

perf: 接口sql优化 /api/v1/assets/nodes/children/tree/
pull/10829/head^2
老广 2023-07-04 11:28:45 +08:00 committed by GitHub
parent 998321f090 b3dce27309
commit 7950718582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/assets/api/tree.py
View File

@ -127,10 +127,13 @@ class NodeChildrenAsTreeApi(SerializeToTreeNodeMixin, NodeChildrenApi):
if not self.instance or not include_assets: if not self.instance or not include_assets:
return Asset.objects.none() return Asset.objects.none()
if query_all: if query_all:
assets = self.instance.get_all_assets_for_tree() assets = self.instance.get_all_assets()
else: else:
assets = self.instance.get_assets_for_tree() assets = self.instance.get_assets()
return assets return assets.only(
"id", "name", "address", "platform_id",
"org_id", "is_active", 'comment'
).prefetch_related('platform')
def filter_queryset_for_assets(self, assets): def filter_queryset_for_assets(self, assets):
search = self.request.query_params.get('search') search = self.request.query_params.get('search')

12
apps/assets/models/node.py
View File

@ -429,18 +429,6 @@ class NodeAssetsMixin(NodeAllAssetsMappingMixin):
assets = Asset.objects.filter(nodes=self) assets = Asset.objects.filter(nodes=self)
return assets.distinct() 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): def get_valid_assets(self):
return self.get_assets().valid() return self.get_assets().valid()