配置是否在线

Controller/UserController.py

@@ -1001,7 +1001,8 @@ class v2LoginView(TemplateView):
         return self.valid_login(user_qs, password, response)
 
     def do_name_login(self, username, password, response):
-        user_qs = Device_User.objects.filter(Q(username=username) | Q(phone=username) | Q(userEmail=username), is_active=True, user_isValid=True)
+        user_qs = Device_User.objects.filter(Q(username=username) | Q(phone=username) | Q(userEmail=username),
+                                             is_active=True, user_isValid=True)
         return self.valid_login(user_qs, password, response)
 
     def valid_login(self, user_qs, password, response):
@@ -1016,7 +1017,7 @@ class v2LoginView(TemplateView):
         res = tko.generate(data={'userID': userID, 'lang': response.lang, 'user': users['username']})
         if tko.code == 0:
             now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
-            user_qs.update(last_login=now_time, online=True, language=response.lang)
+            user_qs.update(last_login=now_time, language=response.lang)
             res['rid'] = users['role__rid']
             res['roleName'] = users['role__roleName']
             res['permList'] = ModelService.own_permission(userID)

Controller/UserManger.py

@@ -20,6 +20,7 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
+from Object.RedisObject import RedisObject
 
 
 # http://192.168.136.40:8077/account/showUserMore?token=test
@@ -255,17 +256,17 @@ def showAllUserInterface(request):
         device_user_count = device_user_queryset.count()
         device_user_res = device_user_queryset.order_by('-data_joined')[(page - 1) * line:page * line]
         sqlDict = CommonService.qs_to_dict(device_user_res)
+        redisObj = RedisObject(db=3)
         for k, v in enumerate(sqlDict["datas"]):
             if len(v['fields']['role']) > 0:
                 role_query_set = Role.objects.get(rid=v['fields']['role'][0])
                 sqlDict["datas"][k]['fields']['role'].append(role_query_set.roleName)
             for val in device_user_res:
                 if v['pk'] == val.userID:
-                    if sqlDict["datas"][k]['fields']['online'] is True:
-                        dl_time = val.last_login + datetime.timedelta(minutes=5)
-                        now_time = timezone.localtime(timezone.now())
-                        if now_time > dl_time:
-                            sqlDict["datas"][k]['fields']['online'] = False
+                    if redisObj.get_data(key=v['pk']):
+                        sqlDict["datas"][k]['fields']['online'] = True
+                    else:
+                        sqlDict["datas"][k]['fields']['online'] = False
         sqlDict['count'] = device_user_count
         return response.json(0, sqlDict)
     else:
@@ -310,7 +311,7 @@ class setUserValidView(View):
             else:
                 return self.UserValidUpdatePC(superID, eUserID, isValid, rid, response)
         else:
-            return response.json(444,'superID or userID')
+            return response.json(444, 'superID or userID')
 
     def UserValidUpdatePC(self, superID, eUserID, isValid, rid, response):
         super = Device_User.objects.filter(userID=superID)

Object/RedisObject.py

@@ -65,8 +65,3 @@ class RedisObject:
 
     def get_size(self):
         return self.CONN.dbsize()
-
-
-redisObj = RedisObject()
-size = redisObj.get_size()
-print(size)

Object/TokenObject.py

@@ -44,9 +44,6 @@ class TokenObject:
             self.user = res.get('user', '')
             # 刷新登录时间
             if self.userID:
-                # device_user = Device_User.objects.get(userID=self.userID)
-                # device_user.online = True
-                # device_user.save()
                 redisObj = RedisObject(db=3)
                 redisObj.set_data(key=self.userID, val='user', expire=300)