修复家庭添加设备问题

修改返回大类排序数据

Controller/EquipmentManagerV3.py

@@ -206,7 +206,7 @@ class EquipmentManagerV3(View):
             userDevice.save()
             # 添加到家庭房间
             if family_id:
-                EquipmentFamilyView.family_room_device_save(family_id, room_id, userDevice.id)
+                EquipmentFamilyView.family_room_device_save(family_id, room_id, userDevice.id, Type)
 
             uid_serial_qs = UIDCompanySerialModel.objects.filter(uid__uid=UID)
             if uid_serial_qs.exists():

Controller/SensorGateway/EquipmentFamilyController.py

@@ -151,7 +151,6 @@ class EquipmentFamilyView(View):
         if not all([nick_name, serial_number, device_type]):
             return response.json(444, {'param': 'nick_name, serial_number, device_type'})
         device_info_qs = Device_Info.objects.filter(serial_number=serial_number, isShare=False)
-        device_type = int(device_type)
         if device_info_qs:
             qs = device_info_qs.values('NickName', 'userID_id', 'userID__userEmail', 'userID__phone',
                                        'userID__username', 'userID__NickName')
@@ -738,6 +737,7 @@ class EquipmentFamilyView(View):
         @return: Boole
         """
         now_time = int(time.time())
+        device_type = int(device_type)
         family_room_device = FamilyRoomDevice.objects.filter(device_id=device_id)
         if family_room_device.exists():
             return False

Controller/SensorGateway/GatewayFamilyRoomController.py

@@ -246,7 +246,7 @@ class GatewayFamilyRoomView(View):
             if not family_room_device_qs.exists():
                 return response.json(0, [])
             sort = FamilyRoomDevice.objects.filter(family_id=family_id).values('category').annotate(
-                count=Count('category')).values('category', 'category_sort')
+                count=Count('category')).values('category', 'category_sort').order_by('category_sort')
             for item in sort:
                 if item['category'] == 0:
                     item['category_name'] = '网关子设备类'
@@ -337,7 +337,7 @@ class GatewayFamilyRoomView(View):
             return response.json(444)
         try:
             family_room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id).values('category').annotate(
-                count=Count('category')).values('category', 'category_sort')
+                count=Count('category')).values('category', 'category_sort').order_by('category_sort')
             for item in family_room_device_qs:
                 if item['category'] == 0:
                     item['category_name'] = '网关子设备类'