修改查询设备按设备添加时间排序

Controller/SensorGateway/EquipmentFamilyController.py

@@ -999,7 +999,7 @@ class EquipmentFamilyView(View):
             return response.json(404)
         family_room_device_qs = FamilyRoomDevice.objects.filter(Q(family_id=family_id), ~Q(device_id__isExist=2),
                                                                 Q(device__userID=user_id)).values().order_by('sort',
-                                                                                                             '-created_time')
+                                                                                                             '-device__data_joined')
         if not family_room_device_qs.exists():
             return response.json(0, device_dict)
         gateways = []

Controller/SensorGateway/GatewayFamilyRoomController.py

@@ -176,9 +176,8 @@ class GatewayFamilyRoomView(View):
             return response.json(404)
         family_id = int(family_id)
         room_id = int(room_id)
-        room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id, room_id=room_id).order_by('sort',
-                                                                                                        '-created_time').values(
-            'device_id', 'device__Type', 'device__NickName', 'sub_device')
+        room_device_qs = FamilyRoomDevice.objects.filter(family_id=family_id, room_id=room_id).values(
+            'device_id', 'device__Type', 'device__NickName', 'sub_device').order_by('sort', '-device__data_joined')
         device_room = []
         if room_device_qs.exists():
             room_name = FamilyRoom.objects.filter(id=room_id)
@@ -258,7 +257,7 @@ class GatewayFamilyRoomView(View):
                                                                                                 'sub_device',
                                                                                                 'category',
                                                                                                 ).order_by(
-                'sort', '-created_time')
+                'sort', '-device__data_joined')
 
             if not family_room_device_qs.exists():
                 return response.json(0, [])

Controller/SensorGateway/SubDeviceController.py

@@ -540,7 +540,7 @@ class GatewaySubDeviceView(View):
 
         try:
             family_room_device_qs = FamilyRoomDevice.objects.filter(Q(family_id=family_id), ~Q(sub_device=0)).values(
-                'sub_device', 'room_id').order_by('sort', '-created_time')
+                'sub_device', 'room_id').order_by('sort', '-device__data_joined')
             if room_id:
                 family_room_device_qs = family_room_device_qs.filter(room_id=room_id)
             device_list = []