修改相同设备序号按时间排序

Controller/SensorGateway/EquipmentFamilyController.py

@@ -998,7 +998,8 @@ class EquipmentFamilyView(View):
         if not permission or permission == '003':
             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')
+                                                                Q(device__userID=user_id)).values().order_by('sort',
+                                                                                                             '-created_time')
         if not family_room_device_qs.exists():
             return response.json(0, device_dict)
         gateways = []
@@ -1051,7 +1052,7 @@ class EquipmentFamilyView(View):
                         cameras.append(device_qs)
             # 处理传感器
             sensors_qs = family_room_device_qs.filter(~Q(sub_device=0))
-            for item in sensors_qs:     # 查询传感器
+            for item in sensors_qs:  # 查询传感器
                 sub_device_qs = GatewaySubDevice.objects.filter(id=item['sub_device']).values()
                 if sub_device_qs.exists():
                     sub_device_dict = {

Controller/SensorGateway/GatewayFamilyRoomController.py

@@ -176,7 +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').values(
+        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')
         device_room = []
         if room_device_qs.exists():
@@ -208,7 +209,8 @@ class GatewayFamilyRoomView(View):
         device_not_room_qs = FamilyRoomDevice.objects.filter(family_id=family_id)
         device_not_room_qs = device_not_room_qs.filter(~Q(room_id=room_id)).values('room_id', 'device_id',
                                                                                    'device__Type', 'device__NickName',
-                                                                                   'sub_device')
+                                                                                   'sub_device').order_by('sort',
+                                                                                                        '-created_time')
         if device_not_room_qs.exists():
             for item in device_not_room_qs:
                 name = ''
@@ -256,7 +258,7 @@ class GatewayFamilyRoomView(View):
                                                                                                 'sub_device',
                                                                                                 'category',
                                                                                                 ).order_by(
-                'sort')
+                'sort', '-created_time')
 
             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')
+                'sub_device', 'room_id').order_by('sort', '-created_time')
             if room_id:
                 family_room_device_qs = family_room_device_qs.filter(room_id=room_id)
             device_list = []