优化删除最近联系人同时删除系统消息，家庭下过滤被重置设备

Controller/SensorGateway/GatewayFamilyMemberController.py

@@ -88,6 +88,9 @@ class GatewayFamilyMemberView(View):
                 for item in items:
                     family_member_join_qs = FamilyMemberJoin.objects.filter(id=int(item))
                     if family_member_join_qs.exists():
+                        sys_msg_qs = SysMsgModel.objects.filter(eventType=705, uid=item)
+                        if sys_msg_qs.exists():
+                            sys_msg_qs.delete()
                         family_member_join_qs.delete()
             return response.json(0)
         except Exception as e:

Controller/SensorGateway/GatewayFamilyRoomController.py

@@ -8,7 +8,7 @@
 """
 
 from django.db import transaction
-from django.db.models import Q, Count, F
+from django.db.models import Q, Count
 from django.views.generic.base import View
 
 from Controller.SensorGateway.EquipmentFamilyController import EquipmentFamilyView
@@ -255,14 +255,10 @@ class GatewayFamilyRoomView(View):
             'sort': []
         }
         try:
-            family_room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id).values('device_id',
-                                                                                                'device__Type',
-                                                                                                'device__NickName',
-                                                                                                'room_id',
-                                                                                                'sub_device',
-                                                                                                'category',
-                                                                                                ).order_by(
-                'sort', '-device__data_joined')
+            family_room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id)
+            family_room_device_qs = family_room_device_qs.filter(~Q(device__isExist=2)) \
+                .values('device_id', 'device__Type', 'device__NickName', 'room_id',
+                        'sub_device', 'category', ).order_by('sort', '-device__data_joined')
 
             if not family_room_device_qs.exists():
                 return response.json(0, device_room)