优化分享设备排序

Controller/DeviceShare.py

@@ -15,6 +15,7 @@
 import json
 import time
 
+from django.db.models import Max
 from django.views.generic.base import View
 
 from Ansjer.config import SERVER_DOMAIN, LOGGER
@@ -174,10 +175,6 @@ class DeviceShareView(View):
         room_id = request_dict.get('roomId', None)
         if not shareToken:
             return response.json(444, {'param': 'shareToken'})
-            # try:
-            #     data = jwt.decode(shareToken, '.#^^&', algorithms='HS256')
-            # except Exception as e:
-            #     return response.json(10, repr(e))
         try:
             redisObj = RedisObject()
             data_str = redisObj.get_data(key=shareToken)
@@ -214,7 +211,13 @@ class DeviceShareView(View):
                         primaryMaster = sharerUser.phone
                     else:
                         return response.json(178)
-                    print(primaryMaster)
+
+                    # 获取当前用户下最大 sort_order
+                    sort_order = Device_Info.objects.filter(userID_id=userID).aggregate(
+                        Max('sort_order'))['sort_order__max'] or 0
+                    # 排序到最前
+                    sharerDvqs.sort_order = sort_order + 1
+
                     sharerDvqs.primaryMaster = primaryMaster
                     sharerDvqs.data_joined = None
                     sharerDvqs.save()
@@ -268,7 +271,6 @@ class DeviceShareView(View):
                         values('bucket__content', 'status', 'channel', 'endTime', 'uid')
                     res = dvql[0]
                     res['vod'] = list(ubqs)
-                    # redisObj.del_data(key=shareToken)
                     return response.json(0, res)
             else:
                 return response.json(174)

Controller/shareUserPermission.py

@@ -11,7 +11,7 @@ from Model.models import Device_User, Device_Info, Role, UserExModel, UidSetMode
 from Service.CommonService import CommonService
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from django.db.models import Q
+from django.db.models import Q, Max
 from Service.ModelService import ModelService
 from Object.RedisObject import RedisObject
 
@@ -201,6 +201,9 @@ class shareUserEquipmentView(View):
         now_time = int(time.time())
         dictLen = 0
         if sharedAll:
+            # 获取当前用户下最大 sort_order
+            sort_order = Device_Info.objects.filter(userID_id=GuestID).aggregate(
+                Max('sort_order'))['sort_order__max'] or 0
             for equipment in Master:
                 eqDict = equipment.model_to_dict(exclude=['id', 'data_joined', 'primaryUserID'])
 
@@ -211,6 +214,7 @@ class shareUserEquipmentView(View):
                     dictLen += 1
                     continue
                 else:
+                    sort_order += 1
                     uid_push_list.append(eqDict.get('UID', None))
                     puserId = eqDict.pop('userID')
                     eqDict['primaryUserID'] = puserId
@@ -218,13 +222,17 @@ class shareUserEquipmentView(View):
                     eqDict['isShare'] = True
                     eqDict['userID_id'] = GuestID
                     eqDict['id'] = CommonService.getUserID(getUser=False)
+                    # 排序到最前
+                    eqDict['sort_order'] = sort_order
                     querysetList.append(Device_Info(**eqDict))
         else:
             content = kwargs.get('content', None)
             if content != None:
                 contentDict = json.loads(content)
                 uidlist = UID = contentDict.get('UID', None)
-                print(uidlist)
+                # 获取当前用户下最大 sort_order
+                sort_order = Device_Info.objects.filter(userID_id=GuestID).aggregate(
+                    Max('sort_order'))['sort_order__max'] or 0
                 for equipment in Master:
                     eqDict = equipment.model_to_dict(exclude=['id', 'data_joined', 'primaryUserID'])
 
@@ -235,6 +243,7 @@ class shareUserEquipmentView(View):
                         if shareEquipment:
                             dictLen += 1
                         else:
+                            sort_order += 1
                             uid_push_list.append(eqDict.get('UID', None))
                             puserId = eqDict.pop('userID')
                             eqDict['primaryUserID'] = puserId
@@ -242,6 +251,8 @@ class shareUserEquipmentView(View):
                             eqDict['isShare'] = True
                             eqDict['userID_id'] = GuestID
                             eqDict['id'] = CommonService.getUserID(getUser=False)
+                            # 排序到最前
+                            eqDict['sort_order'] = sort_order
                             querysetList.append(Device_Info(**eqDict))
                     else:
                         continue
@@ -290,8 +301,6 @@ class shareUserEquipmentView(View):
                             res = {'error_UID': UID, 'Sharing': len(querysetList)}
                         else:
                             res = {'Sharing': len(querysetList)}
-                # redisObj = RedisObject(db=8)
-                # redisObj.del_data(key='uid_qs_' + GuestID)
                 return response.json(0, res)