device_info表新增sort_order字段

Model/models.py

@@ -271,6 +271,7 @@ class Device_Info(models.Model):
     # 分享用户备注名
     noteName = models.CharField(max_length=64, verbose_name=u'用户备注名', default='', blank=True)
     device_group_id = models.IntegerField(default=0, db_index=True, verbose_name='关联设备分组表id')
+    sort_order = models.IntegerField(default=0, db_index=True, verbose_name='排序值')
     ###
     REQUIRED_FIELDS = []
 
@@ -292,7 +293,7 @@ class Device_Info(models.Model):
 
     class Meta:
         db_table = 'device_info'
-        ordering = ('-data_joined',)
+        ordering = ('-sort_order', '-data_joined',)
         verbose_name = u'用户设备信息表'
         verbose_name_plural = verbose_name
 

Service/UserDeviceService.py

@@ -44,9 +44,8 @@ class UserDeviceService:
         dv_qs = dv_qs.values('id', 'userID', 'NickName', 'UID', 'View_Account', 'View_Password', 'ChannelIndex',
                              'Type', 'isShare', 'primaryUserID', 'primaryMaster', 'data_joined', 'vodPrimaryUserID',
                              'vodPrimaryMaster', 'userID__userEmail', 'version', 'isVod', 'isExist', 'NotificationMode',
-                             'isCameraOpenCloud', 'serial_number', 'device_group_id').order_by('-data_joined')
-        dv_list = CommonService.qs_to_list(dv_qs)
-        uid_list = []
+                             'isCameraOpenCloud', 'serial_number', 'device_group_id', 'sort_order').\
+            order_by('-sort_order', '-data_joined')
         exist_uid = []
         unique_results = []
         for item in dv_qs: