优化所在家庭列表信息接口

Controller/SensorGateway/EquipmentFamilyController.py

@@ -64,8 +64,8 @@ class EquipmentFamilyView(View):
         # 获取家庭列表
         elif operation == 'family-list':
             return self.get_family_list(user_id, request_dict, response)
-        # 根据身份获取家庭列表
-        elif operation == "who-family-list":
+        # 查询所在家庭列表
+        elif operation == "where-family-list":
             return self.who_family_list(user_id, response)
         # 家庭保存
         elif operation == 'family-save':
@@ -595,18 +595,23 @@ class EquipmentFamilyView(View):
 
     @staticmethod
     def who_family_list(user_id, response):
-
-        family_member_qs = FamilyMember.objects.filter(user_id=user_id, identity=0) \
+        """
+        查询我加入的家庭集合与我创建的家庭集合
+        @param user_id:
+        @param response:
+        @return:
+        """
+        join_family_qs = FamilyMember.objects.filter(user_id=user_id, identity=0) \
             .order_by('sort').values('identity', 'family_id', 'family__name', 'permission_id', 'permission__no',
                                      'family__location', 'user__username', 'user__userIconUrl')
-        items = EquipmentFamilyView.family_info_list(family_member_qs)
+        join_family_list = EquipmentFamilyView.family_info_list(join_family_qs)
 
-        family_member_qstwo = FamilyMember.objects.filter(user_id=user_id, identity=1) \
+        my_family_qs = FamilyMember.objects.filter(user_id=user_id, identity=1) \
             .order_by('sort').values('identity', 'family_id', 'family__name', 'permission_id', 'permission__no',
                                      'family__location', 'user__username', 'user__userIconUrl')
-        itemstwo = EquipmentFamilyView.family_info_list(family_member_qstwo)
+        my_family_list = EquipmentFamilyView.family_info_list(my_family_qs)
 
-        return response.json(0, {'items': items, 'itemstwo': itemstwo})
+        return response.json(0, {'myFamilyList': my_family_list, 'joinFamilyList': join_family_list})
 
     @staticmethod
     def family_info_list(family_member_qs):