chenjunkai 6 лет назад
Родитель
Сommit
725b897744
2 измененных файлов с 20 добавлено и 10 удалено
  1. 10 6
      Controller/UserManger.py
  2. 10 4
      Controller/shareUserPermission.py

+ 10 - 6
Controller/UserManger.py

@@ -261,12 +261,16 @@ def showAllUserInterface(request):
             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 redisObj.get_data(key=v['pk']):
-                        sqlDict["datas"][k]['fields']['online'] = True
-                    else:
-                        sqlDict["datas"][k]['fields']['online'] = False
+            # for val in device_user_res:
+            #     if v['pk'] == val.userID:
+            #         if redisObj.get_data(key=v['pk']):
+            #             sqlDict["datas"][k]['fields']['online'] = True
+            #         else:
+            #             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:

+ 10 - 4
Controller/shareUserPermission.py

@@ -11,6 +11,7 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from django.db.models import Q
 from Service.ModelService import ModelService
+from Object.RedisObject import RedisObject
 
 
 class searchUserView(View):
@@ -21,12 +22,12 @@ class searchUserView(View):
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
         fieldDict = request.POST
-        return self.searchUser(fieldDict, args, kwargs)
+        return self.validations(fieldDict, args, kwargs)
 
     def get(self, request, *args, **kwargs):
-        request.encoding = 'gb2312'
+        request.encoding = 'utf-8'
         fieldDict = request.GET
-        return self.searchUser(fieldDict, args, kwargs)
+        return self.validations(fieldDict, args, kwargs)
 
     def searchUserSQL(self, fieldDict, response, *args, **kwargs):
         if 'username' in fieldDict.keys():
@@ -98,6 +99,7 @@ class searchUserView(View):
                 device_user_count = qs.count()
                 device_user_res = qs[(page - 1) * line:page * line]
                 sqlDict = CommonService.qs_to_dict(device_user_res)
+                redisObj = RedisObject(db=3)
                 for k, v in enumerate(sqlDict["datas"]):
                     for val in device_user_res:
                         if v['pk'] == val.userID:
@@ -108,12 +110,16 @@ class searchUserView(View):
                     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)
+                    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:
                 return response.json(0, {"datas": ""})
 
-    def searchUser(self, fieldDict, *args, **kwargs):
+    def validations(self, fieldDict, *args, **kwargs):
         token = fieldDict.get('token', None)
         response = ResponseObject()
         tko = TokenObject(token)