From bb217cc4c343b2b3bae4f76b52069051707fea13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=81=A5?= Date: Tue, 11 Mar 2025 17:46:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Em=5Fdate=E5=91=A8=E8=BE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dags/poi/business/district_bank.py | 7 ++++--- dags/poi/business/district_bus.py | 5 +++-- dags/poi/business/district_hospital.py | 5 +++-- dags/poi/business/district_school.py | 5 +++-- dags/poi/business/district_subway.py | 5 +++-- dags/poi/business/district_supermarket.py | 5 +++-- 6 files changed, 19 insertions(+), 13 deletions(-) diff --git a/dags/poi/business/district_bank.py b/dags/poi/business/district_bank.py index f74f009..48c2bdb 100644 --- a/dags/poi/business/district_bank.py +++ b/dags/poi/business/district_bank.py @@ -2,9 +2,10 @@ 小区周边1公里银行入库业务逻辑 """ import logging -from goojia_utils import MAIN_MONGO_CLIENT, process_dataframe_multithread +from goojia_utils import MAIN_MONGO_CLIENT, process_dataframe_multithread, dateutils import pandas as pd from pymongo import UpdateOne +from datetime import datetime import poiutils @@ -75,7 +76,7 @@ def sync_new(distance=3000): action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'bank': item['bank'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'distance': distance}}, + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now(), 'distance': distance}}, upsert=True) actions.append(action) except Exception as e: @@ -111,7 +112,7 @@ def sync1(): action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'bank': item['bank'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat']}}, + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now()}}, upsert=True) actions.append(action) except Exception as e: diff --git a/dags/poi/business/district_bus.py b/dags/poi/business/district_bus.py index a1a4fd0..bcdd5f7 100644 --- a/dags/poi/business/district_bus.py +++ b/dags/poi/business/district_bus.py @@ -6,6 +6,7 @@ from goojia_utils import MAIN_MONGO_CLIENT, process_dataframe_multithread import pandas as pd from pymongo import UpdateOne import poiutils +from datetime import datetime log = logging.getLogger(__name__) @@ -58,7 +59,7 @@ def sync_new(distance=3000): action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'bus': item['bus'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'distance': distance}}, + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now(), 'distance': distance}}, upsert=True) actions.append(action) except Exception as e: @@ -95,7 +96,7 @@ def sync1(): action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'bus': item['bus'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat']}}, + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now()}}, upsert=True) actions.append(action) except Exception as e: diff --git a/dags/poi/business/district_hospital.py b/dags/poi/business/district_hospital.py index 7c19365..d862185 100644 --- a/dags/poi/business/district_hospital.py +++ b/dags/poi/business/district_hospital.py @@ -7,6 +7,7 @@ import poiutils import pandas as pd from pymongo import UpdateOne +from datetime import datetime log = logging.getLogger(__name__) @@ -62,7 +63,7 @@ def sync_new(distance=3000): 'district_name': item['name']}, { '$set': {'hospital': item['hospital'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'distance': distance}}, + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now(), 'distance': distance}}, upsert=True) actions.append(action) except Exception as e: @@ -100,7 +101,7 @@ def sync1(): 'district_name': item['name']}, { '$set': {'hospital': item['hospital'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat']}}, + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now()}}, upsert=True) actions.append(action) except Exception as e: diff --git a/dags/poi/business/district_school.py b/dags/poi/business/district_school.py index d26fb45..aaf5356 100644 --- a/dags/poi/business/district_school.py +++ b/dags/poi/business/district_school.py @@ -6,6 +6,7 @@ from goojia_utils import MAIN_MONGO_CLIENT, process_dataframe_multithread import pandas as pd from pymongo import UpdateOne import poiutils +from datetime import datetime log = logging.getLogger(__name__) @@ -60,7 +61,7 @@ def sync_new(distance=3000): # 周边配套库中历史原因,id可能不为小区id action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'school': item['school'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'distance': distance}}, upsert=True) + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now(), 'distance': distance}}, upsert=True) actions.append(action) except Exception as e: print(e) @@ -93,7 +94,7 @@ def sync1(): # 周边配套库中历史原因,id可能不为小区id action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'school': item['school'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat']}}, upsert=True) + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now()}}, upsert=True) actions.append(action) except Exception as e: print(e) diff --git a/dags/poi/business/district_subway.py b/dags/poi/business/district_subway.py index 6e2826c..ac715fa 100644 --- a/dags/poi/business/district_subway.py +++ b/dags/poi/business/district_subway.py @@ -6,6 +6,7 @@ from goojia_utils import MAIN_MONGO_CLIENT, ElasticSearchClient, process_datafra import pandas as pd from pymongo import UpdateOne import poiutils +from datetime import datetime log = logging.getLogger(__name__) @@ -60,7 +61,7 @@ def sync_new(distance=3000): action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'subway': item['subway'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now(), 'distance': distance}}, upsert=True) actions.append(action) except Exception as e: @@ -98,7 +99,7 @@ def sync1(): action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'subway': item['subway'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat']}}, + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now()}}, upsert=True) actions.append(action) except Exception as e: diff --git a/dags/poi/business/district_supermarket.py b/dags/poi/business/district_supermarket.py index 2e3606e..8424b54 100644 --- a/dags/poi/business/district_supermarket.py +++ b/dags/poi/business/district_supermarket.py @@ -6,6 +6,7 @@ from goojia_utils import MAIN_MONGO_CLIENT, process_dataframe_multithread import pandas as pd from pymongo import UpdateOne import poiutils +from datetime import datetime log = logging.getLogger(__name__) @@ -55,7 +56,7 @@ def sync_new(): # 周边配套库中历史原因,id可能不为小区id action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'supermarket': item['supermarket'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat']}}, upsert=True) + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now()}}, upsert=True) actions.append(action) except Exception as e: print(e) @@ -89,7 +90,7 @@ def sync1(): # 周边配套库中历史原因,id可能不为小区id action = UpdateOne({'city': item['city'], 'region': item['region'], 'district_name': item['name']}, {'$set': {'supermarket': item['supermarket'], 'city': item['city'], 'region': item['region'], - 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat']}}, upsert=True) + 'district_name': item['name'], 'lng': item['lng'], 'lat': item['lat'], 'm_date': datetime.now()}}, upsert=True) actions.append(action) except Exception as e: print(e)