chenshibin 3 роки тому
батько
коміт
9546510f15
1 змінених файлів з 23 додано та 47 видалено
  1. 23 47
      AdminController/DeviceManagementController.py

+ 23 - 47
AdminController/DeviceManagementController.py

@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+import json
+
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from django.views.generic.base import View
 from Service.ModelService import ModelService
 from Service.CommonService import CommonService
-from Model.models import Device_Info
+from Model.models import Device_Info, UidSetModel
 import datetime
 from django.utils import timezone
 
@@ -37,6 +39,8 @@ class DeviceManagement(View):
                 return self.findByUser(request_dict, userID, response)
             elif operation == 'delete':
                 return self.delete(request_dict, userID, response)
+            elif operation == 'uidSetQuery':
+                return self.uidSetQuery(request_dict, userID, response)
         return response.json(444, 'operation')
 
 
@@ -78,52 +82,24 @@ class DeviceManagement(View):
                 0, {'list': send_dict, 'total': count})
         return response.json(0,{'count':0})
 
+    # 管理员查询接口
+    def uidSetQuery(self, request_dict, userID, response):
 
+        pageNo = request_dict.get('pageNo', None)
+        pageSize = request_dict.get('pageSize', None)
+        UID = request_dict.get('UID', None)
+        if not all([pageNo, pageSize]):
+            return response.json(444)
 
-    def delete(self, request_dict, userID, response):
-        own_perm = ModelService.check_perm(userID=userID, permID=10)
-        # redisObj = RedisObject(db=8)
-        # redisObj.del_data(key='uid_qs_' + userID)
-        if own_perm is True:
-            id = request_dict.get('id', None)
-            if id:
-                Device_Info.objects.filter(id=id).delete()
-                return response.json(0)
-            else:
-                return response.json(444,'id must list')
-        else:
-            return response.json(404)
+        page = int(pageNo)
+        line = int(pageSize)
 
-    def findByUser(self, request_dict, userID, response):
-        own_perm = ModelService.check_perm(userID=userID, permID=30)
-        if own_perm is True:
-            page = int(request_dict.get('page', None))
-            line = int(request_dict.get('line', None))
-            username = request_dict.get('username', None)
-            param_flag = CommonService.get_param_flag(data=[page, line, username])
-            if param_flag is True:
-                userID_id= ModelService.get_userID_byname(username=username)
-                print(userID_id)
-                queryset = Device_Info.objects.filter(userID_id=userID_id)
-                if queryset.exists():
-                    count = queryset.count()
-                    res = queryset[(page - 1) * line:page * line]
-                    send_dict = CommonService.qs_to_dict(res)
-                    for k, v in enumerate(send_dict["datas"]):
-                        for val in res:
-                            if v['pk'] == val.id:
-                                if send_dict["datas"][k]['fields']['Online'] is True:
-                                    dl_time = val.update_time + datetime.timedelta(minutes=1)
-                                    now_time = timezone.localtime(timezone.now())
-                                    if now_time > dl_time:
-                                        send_dict["datas"][k]['fields']['Online'] = False
-                                send_dict["datas"][k]['fields']['username']=username
-                                primary= ModelService.get_user_name(send_dict["datas"][k]['fields']['primaryUserID'])
-                                send_dict["datas"][k]['fields']['primaryusername']=primary
-                    send_dict['count'] = count
-                    return response.json(0, send_dict)
-                return response.json(0,{'count':0})
-            else:
-                return response.json(444)
-        else:
-            return response.json(404)
+        omqs = UidSetModel.objects.all().order_by('-id')
+        if UID:
+            omqs = omqs.filter(uid=UID)
+        count = omqs.count()
+        order_ql = omqs[(page - 1) * line:page * line]
+        uidset_json = CommonService.qs_to_dict(order_ql)
+        uidset_json['count'] = count
+        return response.json(
+            0, {'list': uidset_json, 'total': count})