修改删除家庭增加判断，新增家庭设置返回信息

Controller/SensorGateway/EquipmentFamilyController.py

@@ -69,7 +69,7 @@ class EquipmentFamilyView(View):
             return self.family_save(user_id, request_dict, response)
         # 家庭设置
         elif operation == 'family-setting':
-            return self.get_family_setting(request_dict, response)
+            return self.get_family_setting(user_id, request_dict, response)
         # 家庭成员删除
         elif operation == 'member-del':
             return self.family_member_del(user_id, request_dict, response)
@@ -592,9 +592,10 @@ class EquipmentFamilyView(View):
         return items
 
     @classmethod
-    def get_family_setting(cls, request_dict, response):
+    def get_family_setting(cls, user_id, request_dict, response):
         """
         家庭设置
+        @param user_id:
         @param request_dict: 请求
         @param response: 响应
         @return: 家庭列表items
@@ -602,10 +603,14 @@ class EquipmentFamilyView(View):
         family_id = request_dict.get('familyId', None)
         if not family_id:
             return response.json(444)
+        family_id = int(family_id)
         user_family_qs = UserFamily.objects.filter(id=family_id).values('id', 'name', 'location')
         if not user_family_qs.exists():
             return response.json(404)
         family_dict = user_family_qs.first()
+        device_count = FamilyRoomDevice.objects.filter(family_id=family_id, sub_device=0,
+                                                       device__primaryUserID=user_id).count()
+        family_dict['deviceCount'] = device_count
         family_dict['roomCount'] = FamilyRoom.objects.filter(family_id=family_id).count()
 
         family_member_qs = FamilyMember.objects.filter(family_id=family_id)

Controller/SensorGateway/GatewayFamilyMemberController.py

@@ -111,9 +111,16 @@ class GatewayFamilyMemberView(View):
         family_id = int(family_id)
         try:
             with transaction.atomic():
-                family_room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id)
-                if family_room_device_qs.exists():
-                    family_room_device_qs.delete()
+                family_member_qs = FamilyMember.objects.filter(family_id=family_id, identity=0)
+                if family_member_qs.exists():
+                    return response.json(10057)
+                family_room_dev_qs = FamilyRoomDevice.objects.filter(family_id=family_id)
+                if family_room_dev_qs.exists():
+                    return response.json(10057)
+                family_room_qs = FamilyRoom.objects.filter(family_id=family_id)
+                if family_room_qs.exists():
+                    family_room_qs.delete()
+                FamilyMember.objects.filter(family_id=family_id).delete()
                 user_family_qs = UserFamily.objects.filter(id=family_id)
                 if user_family_qs.exists():
                     user_family_qs.delete()