[Update] 使用资产树，去掉集群和资产组

apps/perms/api.py

@@ -10,7 +10,7 @@ from users.permissions import IsValidUser, IsSuperUser, IsSuperUserOrAppUser
 from .utils import NodePermissionUtil
 from .models import NodePermission
 from .hands import AssetGrantedSerializer, User, UserGroup, Asset, \
-    NodeGrantedSerializer, SystemUser
+    NodeGrantedSerializer, SystemUser, NodeSerializer
 from . import serializers
 
 
@@ -30,8 +30,10 @@ class AssetPermissionViewSet(viewsets.ModelViewSet):
     def get_queryset(self):
         queryset = super().get_queryset()
         node_id = self.request.query_params.get('node_id')
+
         if node_id:
             queryset = queryset.filter(node__id=node_id)
+
         return queryset
 
 
@@ -62,6 +64,20 @@ class UserGrantedAssetsApi(ListAPIView):
         return super().get_permissions()
 
 
+class UserGrantedNodesApi(ListAPIView):
+    permission_classes = (IsSuperUser,)
+    serializer_class = NodeSerializer
+
+    def get_queryset(self):
+        user_id = self.kwargs.get('pk', '')
+        if user_id:
+            user = get_object_or_404(User, id=user_id)
+        else:
+            user = self.request.user
+        nodes = NodePermissionUtil.get_user_nodes(user)
+        return nodes.keys()
+
+
 class UserGrantedNodesWithAssetsApi(ListAPIView):
     """
     授权用户的资产组，注：这里的资产组并非是授权列表中授权的，
@@ -134,7 +150,22 @@ class UserGroupGrantedAssetsApi(ListAPIView):
         return queryset
 
 
-class UserGroupGrantedNodeApi(ListAPIView):
+class UserGroupGrantedNodesApi(ListAPIView):
+    permission_classes = (IsSuperUser,)
+    serializer_class = NodeSerializer
+
+    def get_queryset(self):
+        group_id = self.kwargs.get('pk', '')
+        queryset = []
+
+        if group_id:
+            group = get_object_or_404(UserGroup, id=group_id)
+            nodes = NodePermissionUtil.get_user_group_nodes(group)
+            queryset = nodes.keys()
+        return queryset
+
+
+class UserGroupGrantedNodesWithAssetsApi(ListAPIView):
     permission_classes = (IsSuperUser,)
     serializer_class = NodeGrantedSerializer