Merge branch 'pzb' into dev

Controller/UIDPreview.py

@@ -32,13 +32,9 @@ from django.views.generic.base import View
 from Ansjer.config import OSS_STS_ACCESS_SECRET, OSS_STS_ACCESS_KEY
 from Model.models import UID_Preview, Device_Info
 from Object.ResponseObject import ResponseObject
+from Service.ModelService import ModelService
 from Object.TokenObject import TokenObject
 
-'''
-# 获取所有设备下单信息
-http://192.168.136.40:8077/order/querylist?token=local&page=1&line=10
-'''
-
 
 # 设备信息添加
 class UIDPreview(View):
@@ -63,8 +59,10 @@ class UIDPreview(View):
             userID = tko.userID
             if operation == 'add':
                 return self.do_add(userID, request_dict, response)
-            # if operation == 'query':
-            #     return self.do_query(userID, request_dict, response)
+            if operation == 'adminQuery':
+                return self.do_admin_query(request_dict, userID, response)
+            if operation == 'adminDelete':
+                return self.do_admin_delete(request_dict, userID, response)
             else:
                 return response.json(414)
         else:
@@ -118,3 +116,36 @@ class UIDPreview(View):
                 return response.json(14)
         else:
             return response.json(444, 'uid,channel')
+    # 管理员查询接口
+    def do_admin_query(self, request_dict, userID, response):
+        own_perm = ModelService.check_perm(userID, 20)
+        if own_perm is True:
+            page = request_dict.get('page', None)
+            line = request_dict.get('line', None)
+            uid = request_dict.get('uid', None)
+            channel = request_dict.get('channel', None)
+            page = int(page)
+            line = int(line)
+            omqs = UID_Preview.objects.filter()
+            # 筛选指定设备id的订单
+            if uid:
+                omqs = omqs.filter(uid=uid)
+            if channel:
+                omqs = omqs.filter(channel=channel)
+            if not omqs.exists():
+                return response.json(0, [])
+            count = omqs.count()
+            order_ql = omqs[(page - 1) * line:page * line].values("id", "uid", "channel", "addTime", "updTime")
+            order_list = list(order_ql)
+            return response.json(0, {'data': order_list, 'count': count})
+        else:
+            return response.json(404)
+
+    def do_admin_delete(self, request_dict, userID, response):
+        own_perm = ModelService.check_perm(userID, 20)
+        if own_perm is True:
+            id = request_dict.get('id')
+            UID_Preview.objects.filter(id=id).delete()
+            return response.json(0)
+        else:
+            return response.json(404)