Przeglądaj źródła

日志接口修改

pzb 5 lat temu
rodzic
commit
a8980e1bbf
2 zmienionych plików z 10 dodań i 4 usunięć
  1. 2 0
      Controller/DynamoDBLog.py
  2. 8 4
      Service/MiscellService.py

+ 2 - 0
Controller/DynamoDBLog.py

@@ -140,6 +140,8 @@ class DynamoDBLog(View):
                     res[k] = count
                 else:
                     res[k] = 0
+
+            # res = MiscellService.get_item_date(user_brand,time_stamp)
             return response.json(0, {'count': res})
         else:
             return response.json(404)

+ 8 - 4
Service/MiscellService.py

@@ -91,13 +91,15 @@ class MyserviceDynamodb():
         try:
             table = dynamodb.Table(table_name)
             response = table.scan(
+                Select='COUNT',
                 FilterExpression=(Attr('addTime').gt(start_date)
                                  & Key('addTime').lt(end_date)) | Key('addTime').eq(start_date)
             )
+            items = response['Count']
+            return items
         except Exception as e:
             logger.error("Failed to get table {0}, error".format(table_name, e))
-        items = response['Items']
-        return  len(items)
+            return 0
 
     # 时间段搜索
     def get_item_date(self, table_name, date):
@@ -115,10 +117,12 @@ class MyserviceDynamodb():
                 start_date = int(start_date.timestamp())
                 end_date = int(end_date.timestamp())
                 response = table.scan(
+                    Select = 'COUNT',
                     FilterExpression=(Attr('addTime').gt(start_date)
                                       & Key('addTime').lt(end_date)) | Key('addTime').eq(start_date)
                 )
-                count = len(response['Items'])
+                print (response['Count'])
+                count = response['Count']
                 if count:
                     res[k] = count
                 else:
@@ -435,7 +439,7 @@ def dynamo_db_add_log_ctr(request, status_code):
     num = 1
     clientIP = CommonService.get_ip_address(request)
     token = request_dict.get('token', None)
-    userID = ''
+    userID = ''
     if token is not None:
         tko = TokenObject(token)
         userID = tko.userID