Merge branch 'pzb' of ssh://192.168.136.45:10022/SERVER/AnsjerServer into pzb

Controller/UserBrandController.py

@@ -23,11 +23,13 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from collections import Counter
+from Ansjer.config import DOMAIN_HOST
+from Object.RedisObject import RedisObject
 '''
-http://192.168.136.39:8000/userbrandinfo/queryByAdmin?token=test&page=1&line=10  全部记录
+http://192.168.136.39:8000/userbrandinfo/queryByAdmin?token=test&page=1&line=10  记录
 http://192.168.136.39:8000/userbrandinfo/queryArea?token=test   市的区域统计
 http://192.168.136.39:8000/userbrandinfo/queryDeviceSupplier?token=test 品牌统计
-http://192.168.136.39:8000/userbrandinfo/queryAllByAdmin?token=test&page=1&line=10  全部记录中过滤查询每个用户的最新一条数据
+http://192.168.136.39:8000/userbrandinfo/queryAllByAdmin?token=test&page=1&line=10  全部记录中每个用户的数据
 
 http://192.168.136.39:8000/userbrandinfo/queryAll?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiY24iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJleHAiOjE1NTk4OTY4NTd9.nhK3VSghSGjyXKjel4woz7R_3bhjgqQDlX-ypYsklNU&page=1&line=5
 '''
@@ -56,100 +58,122 @@ class MyserviceDynamodb(object):
     # 创建user_brand_all表
     def user_brand_all_table_create(self, table_name):
         dynamodb = self.session.resource('dynamodb')
-        try:
-            table = dynamodb.create_table(
-                TableName=table_name,
-                KeySchema=[
-                    {
-                        'AttributeName': 'userID',
-                        'KeyType': 'HASH'
-                    },
-                    {
-                        'AttributeName': 'addTime',
-                        'KeyType': 'RANGE'
+        inventory = my.tables_list(table_name)
+        if table_name in inventory:
+            print ('包含')
+        else:
+            try:
+                table = dynamodb.create_table(
+                    TableName=table_name,
+                    KeySchema=[
+                        {
+                            'AttributeName': 'userID',
+                            'KeyType': 'HASH'
+                        },
+                        {
+                            'AttributeName': 'addTime',
+                            'KeyType': 'RANGE'
+                        }
+                    ],
+                    AttributeDefinitions=[
+                        {
+                            'AttributeName': 'userID',
+                            'AttributeType': 'S'
+                        },
+                        {
+                            'AttributeName': 'addTime',
+                            'AttributeType': 'N'
+                        },
+
+                    ],
+                    ProvisionedThroughput={
+                        'ReadCapacityUnits': 5,
+                        'WriteCapacityUnits': 5,
                     }
-                ],
-                AttributeDefinitions=[
-                    {
-                        'AttributeName': 'userID',
-                        'AttributeType': 'S'
-                    },
-                    {
-                        'AttributeName': 'addTime',
-                        'AttributeType': 'N'
-                    },
-
-                ],
-                ProvisionedThroughput={
-                    'ReadCapacityUnits': 5,
-                    'WriteCapacityUnits': 5,
-                }
-            )
-        except Exception:
-            print ('已经创建该表了')
+                )
+            except Exception:
+                logger.error (table_name + '表已经存在')
+
+    # 查询aws数据库里面有什么表
+    def tables_list(self,table_name):
+        client = self.session.client('dynamodb')
+        response = client.list_tables()
+        return response['TableNames']
+
 
     # 创建user_brand表
     def table_create(self,table_name):
         dynamodb = self.session.resource('dynamodb')
-        try:
-            table = dynamodb.create_table(
-                TableName=table_name,
-                KeySchema=[
-                    {
-                        'AttributeName': 'userID',
-                        'KeyType': 'HASH'
-                    },
-                    {
-                        'AttributeName': 'username',
-                        'KeyType': 'RANGE'
+        inventory = my.tables_list(table_name)
+        if table_name in inventory:
+            print ('包含')
+        else:
+            try:
+                table = dynamodb.create_table(
+                    TableName=table_name,
+                    KeySchema=[
+                        {
+                            'AttributeName': 'userID',
+                            'KeyType': 'HASH'
+                        },
+                        {
+                            'AttributeName': 'username',
+                            'KeyType': 'RANGE'
+                        }
+                    ],
+                    AttributeDefinitions=[
+                        {
+                            'AttributeName': 'userID',
+                            'AttributeType': 'S'
+                        },
+                        {
+                            'AttributeName': 'username',
+                            'AttributeType': 'S'
+                        },
+
+                    ],
+                    ProvisionedThroughput={
+                        'ReadCapacityUnits': 5,
+                        'WriteCapacityUnits': 5,
                     }
-                ],
-                AttributeDefinitions=[
-                    {
-                        'AttributeName': 'userID',
-                        'AttributeType': 'S'
-                    },
-                    {
-                        'AttributeName': 'username',
-                        'AttributeType': 'S'
-                    },
-
-                ],
-                ProvisionedThroughput={
-                    'ReadCapacityUnits': 5,
-                    'WriteCapacityUnits': 5,
-                }
-            )
-        except Exception:
-            print ('已经创建该表了')
+                )
+            except Exception:
+                logger.error (table_name+'表已经存在')
+
 
     # 添加user_brand_all表数据
-    def user_brand_all_item_put(self, table_name,user_id, add_time,username,device_supplier,device_model,os_type,os_version,country,province,city,area,street,longitude,latitude,app_id,status_all,ip):
+    def user_brand_all_item_put(self, table_name,data_list):
         dynamodb = self.session.resource('dynamodb')
         table = dynamodb.Table(table_name)
-        table.put_item(
-            Item={
-                'userID': user_id,
-                'addTime': add_time,
-                'username': username,
-                'deviceSupplier': device_supplier,
-                'deviceModel': device_model,
-                'osType': os_type,
-                'osVersion': os_version,
-                'country' : country,
-                'province': province,
-                'city': city,
-                'area': area,
-                'street': street,
-                'longitude': longitude,
-                'latitude': latitude,
-                'appId': app_id,
-                'status_all': status_all,
-                'ExpirationTime_TTL' : add_time+2592000,
-                'ip': ip,
-            }
-        )
-        print ('添加数据成功！')
+        try:
+            with table.batch_writer() as batch:
+                for i in data_list:
+                    data = json.loads(i.decode('utf-8'))
+                    batch.put_item(
+                        Item={
+                            'userID': data['userID'],
+                            'addTime': data['addTime'],
+                            'username': data['username'],
+                            'deviceSupplier': data['deviceSupplier'],
+                            'deviceModel': data['deviceModel'],
+                            'osType': data['osType'],
+                            'osVersion': data['osVersion'],
+                            'country' : data['country'],
+                            'province': data['province'],
+                            'city': data['city'],
+                            'area': data['area'],
+                            'street': data['street'],
+                            'longitude': data['longitude'],
+                            'latitude': data['latitude'],
+                            'appId': data['appId'],
+                            'status_all': data['status_all'],
+                            'ExpirationTime_TTL' : data['ExpirationTime_TTL'],
+                            'ip': data['ip'],
+                        }
+                    )
+                print ('批量添加数据成功！')
+        except Exception:
+            logger.error ('批量添加表数据失败！')
 
     # 添加user_brand表数据
     def user_brand_item_put(self, table_name, user_id, username,add_time, device_supplier, device_model, os_type,
@@ -157,38 +181,32 @@ class MyserviceDynamodb(object):
                                 status_all, ip):
         dynamodb = self.session.resource('dynamodb')
         table = dynamodb.Table(table_name)
-        table.put_item(
-            Item={
-                'userID': user_id,
-                'username': username,
-                'addTime': add_time,
-                'deviceSupplier': device_supplier,
-                'deviceModel': device_model,
-                'osType': os_type,
-                'osVersion': os_version,
-                'country': country,
-                'province': province,
-                'city': city,
-                'area': area,
-                'street': street,
-                'longitude': longitude,
-                'latitude': latitude,
-                'appId': app_id,
-                'ExpirationTime_TTL': add_time + 2592000,
-                'status_all': status_all,
-                'ip': ip,
-            }
-        )
-        print ('添加数据成功！')
-
-    def get_time_to_live(self,table_name):
-        dynamodb = self.session.resource('dynamodb')
-        if not dynamodb:
-            raise DynamodbConnectionError("Failed to get resource for dynamodb!")
-        table = dynamodb.Table(table_name)
-        response = table.describe_time_to_live()
-        print (response)
-        print ('生命周期')
+        try:
+            table.put_item(
+                Item={
+                    'userID': user_id,
+                    'username': username,
+                    'addTime': add_time,
+                    'deviceSupplier': device_supplier,
+                    'deviceModel': device_model,
+                    'osType': os_type,
+                    'osVersion': os_version,
+                    'country': country,
+                    'province': province,
+                    'city': city,
+                    'area': area,
+                    'street': street,
+                    'longitude': longitude,
+                    'latitude': latitude,
+                    'appId': app_id,
+                    'ExpirationTime_TTL': add_time + 2592000,
+                    'status_all': status_all,
+                    'ip': ip,
+                }
+            )
+            print ('添加表一条数据成功！')
+        except Exception:
+            logger.error ('添加表一条数据失败！')
 
     # page分页数，line条数，table_name表名称，last_evaluated查询开始值，page_value记录分页开始值
     def get_page_line(self, page, line, table_name, last_evaluated,page_value):
@@ -236,15 +254,19 @@ class MyserviceDynamodb(object):
     def item_get_count(self,table_name):
         dynamodb = self.session.resource('dynamodb')
         table = dynamodb.Table(table_name)
+
         response = table.scan()
         return len(response['Items'])
 
     def item_get_brand(self,table_name):
         dynamodb = self.session.resource('dynamodb')
         table = dynamodb.Table(table_name)
-        response = table.scan()
-        response = response['Items']
-        return response
+        try:
+            response = table.scan()
+            response = response['Items']
+            return response
+        except Exception:
+            logger.error("Failed to put item in to {0}:error{1}".format(table))
 
     def put_item(self, table, item_dict=None):
         try:
@@ -338,8 +360,14 @@ class MyserviceDynamodb(object):
 my = MyserviceDynamodb()
 # print(my.table_delete('user_brand'))
 # print(my.table_delete('user_brand_all'))
-my.table_create('user_brand')
-my.user_brand_all_table_create('user_brand_all')
+if DOMAIN_HOST == 'www.dvema.com':
+    user_brand = 'user_brand'
+    user_brand_all = 'user_brand_all'
+else:
+    user_brand = 'test_user_brand'
+    user_brand_all = 'test_user_brand_all'
+my.table_create(user_brand)
+my.user_brand_all_table_create(user_brand_all)
 # print(my.item_put('user_brand'))
 # table_value = my.get_table('user_brand')
 
@@ -370,19 +398,25 @@ class UserBrandInfo(View):
             response.lang = tko.lang
             if tko.code == 0:
                 userID = tko.userID
+                if DOMAIN_HOST == 'www.dvema.com':
+                    user_brand = 'user_brand'
+                    user_brand_all = 'user_brand_all'
+                else:
+                    user_brand = 'test_user_brand'
+                    user_brand_all = 'test_user_brand_all'
                 if userID is not None:
                     if operation == 'queryByAdmin':
-                        return self.query_info(request_dict, userID,response)
+                        return self.query_info(request_dict, userID,user_brand,user_brand_all,response)
                     elif operation == 'add':
-                        return self.add_info(request_dict, userID,response)
+                        return self.add_info(request_dict, userID,user_brand,user_brand_all,response)
                     elif operation == 'queryAllByAdmin':
-                        return self.query_all_info(request_dict, userID,response)
+                        return self.query_all_info(request_dict, userID,user_brand,user_brand_all,response)
                     elif operation == 'deleteByAdmin':
-                        return self.delete_by_admin(request_dict, userID,response)
+                        return self.delete_by_admin(request_dict, userID,user_brand,user_brand_all,response)
                     elif operation == 'queryDeviceSupplier':
-                        return self.query_deviceSupplier_info(request_dict, userID,response)
+                        return self.query_deviceSupplier_info(request_dict, userID,user_brand,user_brand_all,response)
                     elif operation == 'queryArea':
-                        return self.query_area_info(request_dict, userID,response)
+                        return self.query_area_info(request_dict, userID,user_brand,user_brand_all,response)
 
                     else:
                         return response.json(444)
@@ -394,7 +428,7 @@ class UserBrandInfo(View):
             return response.json(309)
             # 获取外网IP
     # http://192.168.136.39:8000/userbrandinfo?operation=add&token=test&deviceSupplier=小米&deviceModel=HM NOTE 1TD&osType=WEB&osVersion=4.0.0
-    def add_info(self, request_dict, userID,response):
+    def add_info(self, request_dict, userID,user_brand,user_brand_all,response):
         deviceSupplier = request_dict.get('deviceSupplier', None)
         deviceModel = request_dict.get('deviceModel', None)
         osType = request_dict.get('osType', None)
@@ -456,12 +490,42 @@ class UserBrandInfo(View):
                 print (time.time())
                 username = Device_User.objects.filter(userID = userID).values('userID','username','NickName')
                 username = username[0]['username']
-                # 添加user_brand_all表信息
-                my.user_brand_all_item_put('user_brand_all', userID, addTime, username, deviceSupplier, deviceModel, osType, osVersion,
-                                country, province, city, area, street, longitude , latitude, appId, status,
-                                        self.clientIP)
+                add_data = {
+                    'userID': userID,
+                    'addTime': addTime,
+                    'username': username,
+                    'deviceSupplier': deviceSupplier,
+                    'deviceModel': deviceModel,
+                    'osType': osType,
+                    'osVersion': osVersion,
+                    'country': country,
+                    'province': province,
+                    'city': city,
+                    'area': area,
+                    'street': street,
+                    'longitude': longitude,
+                    'latitude': latitude,
+                    'appId': appId,
+                    'status_all': status,
+                    'ExpirationTime_TTL': addTime + 2592000,
+                    'ip': self.clientIP
+                }
+                redisObj = RedisObject()
+                add_user_brand_all_data = json.dumps(add_data)
+                if DOMAIN_HOST == 'www.dvema.com':
+                    logKey = 'user_brand_all'
+                else:
+                    logKey = 'test_user_brand_all'
+                redisObj.rpush(name=logKey, val=add_user_brand_all_data)
+                print (redisObj.llen(name=logKey))
+                # 判断redis列表长度
+                if redisObj.llen(name=logKey) > 10:
+                    data_list = redisObj.lrange(logKey, 0, -1)
+                    redisObj.del_data(key=logKey)
+                    # 添加user_brand_all表信息
+                    my.user_brand_all_item_put(user_brand_all, data_list)
                 # 添加user_brand表信息
-                my.user_brand_item_put('user_brand', userID, username, addTime, deviceSupplier, deviceModel,
+                my.user_brand_item_put(user_brand, userID, username, addTime, deviceSupplier, deviceModel,
                             osType, osVersion,
                             country, province, city, area, street, longitude, latitude, appId, status,
                             self.clientIP)
@@ -476,7 +540,7 @@ class UserBrandInfo(View):
 
 
     # 查询每个用户的最新登录数据表
-    def query_info(self, request_dict, userID,response):
+    def query_info(self, request_dict, userID,user_brand,user_brand_all,response):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
         username = request_dict.get('username',None)
@@ -486,24 +550,25 @@ class UserBrandInfo(View):
             page_value=[]
             if check_perm is True:
                 if username is None or username is '':
-                    table_Limit_value = my.get_page_line(page,line,'user_brand',None,page_value)
+                    table_Limit_value = my.get_page_line(page,line,user_brand,None,page_value)
                     # 页面减1
                     page = page-1
                     if page < len(table_Limit_value):
                         # 分页后查询
-                        table_value = my.item_get(line,'user_brand',table_Limit_value[page])
+                        table_value = my.item_get(line,user_brand,table_Limit_value[page])
                         table_value = table_value['Items']
-                        count = my.item_get_count('user_brand')
+                        count = my.item_get_count(user_brand)
                         return response.json(0, {'datas': table_value, 'count': count})
                 else:
                     # 查询
-                    table_value = my.get_item('user_brand', 'username' ,username)
+                    table_value = my.get_item(user_brand, 'username' ,username)
                     return response.json(0, {'datas': table_value, 'count': len(table_value)})
             else:
                 return response.json(404)
         else:
             return response.json(444)
-    def delete_by_admin(self, request_dict, userID,response):
+        # 删除接口
+    def delete_by_admin(self, request_dict, userID,user_brand,user_brand_all,response):
         id = request_dict.getlist('id', None)
         username = request_dict.getlist('username', None)
         add_time = request_dict.getlist('add_time', None)
@@ -513,17 +578,17 @@ class UserBrandInfo(View):
         if param_flag is True:
             check_perm = ModelService.check_perm(userID=userID, permID=10)
             if check_perm is True:
-                if str(table_name[0])==str('user_brand'):
-                    is_delete = my.item_delete('user_brand', id[0],username[0], add_time[0])
+                if str(table_name[0])==str(user_brand):
+                    is_delete = my.item_delete(user_brand, id[0],username[0], add_time[0])
                 else:
-                    is_delete = my.item_delete('user_brand_all', id[0],add_time[0], add_time[0])
+                    is_delete = my.item_delete(user_brand_all, id[0],add_time[0], add_time[0])
                 return response.json(0, {'delete_count': is_delete[0]})
             else:
                 return response.json(404)
         else:
             return response.json(444)
-    # 查询每个用户最新的一条记录统计信息
-    def query_all_info(self, request_dict, userID,response):
+    # Query each user record statistics
+    def query_all_info(self, request_dict, userID,user_brand,user_brand_all,response):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
         username = request_dict.get('username', None)
@@ -533,27 +598,27 @@ class UserBrandInfo(View):
             page_value = []
             if check_perm is True:
                 if username is None or username is '':
-                    table_Limit_value = my.get_page_line(page, line, 'user_brand_all', None, page_value)
+                    table_Limit_value = my.get_page_line(page, line, user_brand_all, None, page_value)
                     page = page - 1
                     if page < len(table_Limit_value):
-                        table_value = my.item_get(line, 'user_brand_all', table_Limit_value[page])
+                        table_value = my.item_get(line, user_brand_all, table_Limit_value[page])
                         table_value = table_value['Items']
-                        count = my.item_get_count('user_brand_all')
+                        count = my.item_get_count(user_brand_all)
                         return response.json(0, {'datas': table_value, 'count': count})
                 else:
                     # 查询
-                    table_value = my.get_item('user_brand_all', 'username', username)
+                    table_value = my.get_item(user_brand_all, 'username', username)
                     return response.json(0, {'datas': table_value, 'count': len(table_value)})
             else:
                 return response.json(404)
         else:
             return response.json(444)
 
-    # 品牌统计的接口
-    def query_deviceSupplier_info(self, request_dict, userID,response):
+    # Brand statistics interface
+    def query_deviceSupplier_info(self, request_dict, userID,user_brand,user_brand_all,response):
         check_perm = ModelService.check_perm(userID=userID,permID=30)
         if check_perm is True:
-            table_value = my.item_get_brand('user_brand')
+            table_value = my.item_get_brand(user_brand)
             send_jsons = []
             counts = 0
             for i in table_value:
@@ -565,13 +630,13 @@ class UserBrandInfo(View):
 
         else:
             return response.json(404)
-    # 区域统计的接口
-    def query_area_info(self, request_dict, userID,response):
+    # Interface to area statistics
+    def query_area_info(self, request_dict, userID,user_brand,user_brand_all,response):
         check_perm = ModelService.check_perm(userID=userID,permID=30)
         district = request_dict.get('district', None)
         if check_perm is True:
             # 按照用户去重复查询
-            table_value = my.item_get_brand('user_brand')
+            table_value = my.item_get_brand(user_brand)
             send_jsons = []
             counts = 0
             for  i in table_value:

Service/middleware.py

@@ -88,5 +88,4 @@ class StatisticsUrlMiddleware(MiddlewareMixin):
             except Exception as e:
                 print(repr(e))
             django.db.close_old_connections()
-        return response
-
+        return response