start Time

end Time

Controller/DetectController.py

@@ -39,19 +39,19 @@ class DetectControllerView(View):
     def dispatch(self, *args, **kwargs):
         return super(DetectControllerView, self).dispatch(*args, **kwargs)
 
-    def __init__(self):
-        self.ip = ''
+    # def __init__(self):
+    #     self.ip = ''
 
     def get(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
-        self.ip = CommonService.get_ip_address(request)
+        # self.ip = CommonService.get_ip_address(request)
         return self.validation(request.GET, operation)
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         operation = kwargs.get('operation')
-        self.ip = CommonService.get_ip_address(request)
+        # self.ip = CommonService.get_ip_address(request)
         return self.validation(request.POST, operation)
 
     def validation(self, request_dict, operation):
@@ -79,16 +79,21 @@ class DetectControllerView(View):
     def do_query(self, request_dict, response, userID):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
-        nowTime = int(time.time())
         if not page or not line:
             return response.json(444, 'page,line')
-
-        qs = Equipment_Info.objects.filter(userID_id=userID, addTime__gte=nowTime - 3600 * 24 * 27)
-        uid = request_dict.get('uid', None)
-        if uid:
-            qs = qs.filter(devUid=uid)
-            dvqs = Device_Info.objects.filter(UID=uid).values('Type', 'NickName')
-            uid_type_dict = {uid: {'type': dvqs[0]['Type'], 'NickName': dvqs[0]['NickName']}}
+        startTime = request_dict.get('startTime', None)
+        endTime = request_dict.get('endTime', None)
+        qs = Equipment_Info.objects.filter(userID_id=userID)
+        if startTime and endTime:
+            qs = qs.filter(addTime__range=(startTime, endTime))
+        uids = request_dict.get('uids', None)
+        if uids:
+            uid_list = uids.split(',')
+            qs = qs.filter(devUid__in=uid_list)
+            dvqs = Device_Info.objects.filter(UID__in=uid_list).values('Type', 'NickName')
+            uid_type_dict = {}
+            for dv in dvqs:
+                uid_type_dict[dv['UID']] = {'type': dv['Type'], 'NickName': dv['NickName']}
         else:
             dvqs = Device_Info.objects.filter(userID_id=userID).values('UID', 'Type', 'NickName')
             uid_type_dict = {}

Controller/UserController.py

@@ -527,6 +527,7 @@ class refreshTokenView(TemplateView):
                         user_extend_qs.update(**update_dict)
                 except Exception as e:
                     pass
+                # # #
                 return response.json(0, res)
             else:
                 return response.json(tko.code)