diff --git a/config/__pycache__/config.cpython-36.pyc b/config/__pycache__/config.cpython-36.pyc index 1230e99..81e047f 100644 Binary files a/config/__pycache__/config.cpython-36.pyc and b/config/__pycache__/config.cpython-36.pyc differ diff --git a/config/config.py b/config/config.py index 28490e6..69cce0a 100644 --- a/config/config.py +++ b/config/config.py @@ -14,4 +14,4 @@ if not is_debug: (1016, 6001, 'shop_1016'), (1016, 6001, 'shop_new_1016'), (1016, 6001, 'tap_1016'), (1016, 6001, 'tap_new_1016'), (2001, 6001, 'tap_2001'), (2001, 6001, 'tap_new_2001')) else: - event_list = ((1001, 6001, 'items_produce'), (1001, 6001, 'items_consum'),(1001, 6001, 'share_map')) + event_list = ((1004, 6001, 'items_produce'), (1004, 6001, 'items_consum'),(1004, 6001, 'share_map')) diff --git a/mytask/__pycache__/tasks_base.cpython-36.pyc b/mytask/__pycache__/tasks_base.cpython-36.pyc index dba3629..4ecc583 100644 Binary files a/mytask/__pycache__/tasks_base.cpython-36.pyc and b/mytask/__pycache__/tasks_base.cpython-36.pyc differ diff --git a/mytask/__pycache__/tga.cpython-36.pyc b/mytask/__pycache__/tga.cpython-36.pyc index 3d3ca62..62a66c7 100644 Binary files a/mytask/__pycache__/tga.cpython-36.pyc and b/mytask/__pycache__/tga.cpython-36.pyc differ diff --git a/mytask/tga.py b/mytask/tga.py index 8f887d3..ee68335 100644 --- a/mytask/tga.py +++ b/mytask/tga.py @@ -349,6 +349,7 @@ class GetFromTga: if line: try: temp['num'], temp['u_num'], temp['activity_id_str'] = line + print(f"123 {temp}") temp['activity_id'] = activity_ids.get(temp['activity_id_str']) self.write_tga_files(temp) except Exception: diff --git a/ops/scripts.py b/ops/scripts.py index 3829c9f..05255bf 100644 --- a/ops/scripts.py +++ b/ops/scripts.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- import pymongo - +import pdb def get_activity_ids(): # get data from mongodb @@ -9,12 +9,9 @@ def get_activity_ids(): myclient = pymongo.MongoClient("mongodb://10.10.5.6:27017/") mydb = myclient["garfield-production"] mycol = mydb["system_dics"] - myquery = {type: 'share_cfg', 'deleted': False} + myquery = {'type': 'share_cfg', 'deleted': False} out_area = {'key': 1, 'value': 1, '_id': 0} - all = [] + all = {} for x in mycol.find(myquery, out_area): - temp = {} - a, b = x - temp[a] = b - all.append(temp) + all[x['key']]=x['value'] return all