优化异常捕获
This commit is contained in:
@@ -35,53 +35,63 @@ def find_around_by_location(city, location):
|
||||
:param location:
|
||||
:return:
|
||||
"""
|
||||
bank_df = elastic_client.scan_to_data_frame('amap_poi', {
|
||||
"_source": ["name"],
|
||||
"query": {
|
||||
"bool": {
|
||||
"must_not": [
|
||||
{
|
||||
"term": {
|
||||
"status": {
|
||||
"value": 1
|
||||
try:
|
||||
bank_df = elastic_client.scan_to_data_frame('amap_poi', {
|
||||
"_source": ["name"],
|
||||
"query": {
|
||||
"bool": {
|
||||
"must_not": [
|
||||
{
|
||||
"term": {
|
||||
"status": {
|
||||
"value": 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"filter": [
|
||||
{"terms": {
|
||||
"typecode": bank_typecode
|
||||
}},
|
||||
{
|
||||
"term": {
|
||||
"cityname": {
|
||||
"value": city
|
||||
],
|
||||
"filter": [
|
||||
{"terms": {
|
||||
"typecode": bank_typecode
|
||||
}},
|
||||
{
|
||||
"term": {
|
||||
"cityname": {
|
||||
"value": city
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"geo_distance": {
|
||||
"distance": 1000,
|
||||
"location": location
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"geo_distance": {
|
||||
"distance": 1000,
|
||||
"location": location
|
||||
}
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
if len(bank_df) > 0:
|
||||
return bank_df['name'].tolist()
|
||||
return []
|
||||
|
||||
});
|
||||
if len(bank_df) > 0:
|
||||
return bank_df['name'].tolist()
|
||||
return []
|
||||
except Exception as e:
|
||||
print(e)
|
||||
return []
|
||||
|
||||
def deal(city, lng, lat):
|
||||
location = [lng, lat]
|
||||
bank_df = find_around_by_location(city, location)
|
||||
return bank_df
|
||||
|
||||
### 临时后续注释
|
||||
after_dongguan = False
|
||||
|
||||
for city_item in city_dict:
|
||||
city = city_item['display']
|
||||
log.info('开始查找' + city + '周边银行')
|
||||
if city == '东莞':
|
||||
after_dongguan = True
|
||||
if not after_dongguan:
|
||||
continue
|
||||
seaweed_df = pd.DataFrame(list(seaweed_conn.find({'city': city, 'cat': 'district', 'status': 0, 'lng': {'$ne': None}},
|
||||
{'city': 1, 'region': 1, 'name': 1, 'lng': 1, 'lat': 1}).batch_size(10000)))
|
||||
seaweed_df['lng'] = seaweed_df['lng'] / 10 ** 10
|
||||
|
||||
@@ -27,43 +27,47 @@ def find_around_by_location(city, location):
|
||||
:param location:
|
||||
:return:
|
||||
"""
|
||||
bus_df = elastic_client.scan_to_data_frame('amap_poi', {
|
||||
"_source": ["name"],
|
||||
"query": {
|
||||
"bool": {
|
||||
"must_not": [
|
||||
{
|
||||
"term": {
|
||||
"status": {
|
||||
"value": 1
|
||||
try:
|
||||
bus_df = elastic_client.scan_to_data_frame('amap_poi', {
|
||||
"_source": ["name"],
|
||||
"query": {
|
||||
"bool": {
|
||||
"must_not": [
|
||||
{
|
||||
"term": {
|
||||
"status": {
|
||||
"value": 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"filter": [
|
||||
{"terms": {
|
||||
"typecode": bus_typecode
|
||||
}},
|
||||
{
|
||||
"term": {
|
||||
"cityname": {
|
||||
"value": city
|
||||
],
|
||||
"filter": [
|
||||
{"terms": {
|
||||
"typecode": bus_typecode
|
||||
}},
|
||||
{
|
||||
"term": {
|
||||
"cityname": {
|
||||
"value": city
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"geo_distance": {
|
||||
"distance": 1000,
|
||||
"location": location
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"geo_distance": {
|
||||
"distance": 1000,
|
||||
"location": location
|
||||
}
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
if len(bus_df) > 0:
|
||||
return bus_df['name'].tolist()
|
||||
return []
|
||||
});
|
||||
if len(bus_df) > 0:
|
||||
return bus_df['name'].tolist()
|
||||
return []
|
||||
except Exception as e:
|
||||
print(e)
|
||||
return []
|
||||
|
||||
|
||||
def deal(city, lng, lat):
|
||||
@@ -71,10 +75,16 @@ def deal(city, lng, lat):
|
||||
bus_df = find_around_by_location(city, location)
|
||||
return bus_df
|
||||
|
||||
### 临时后续注释
|
||||
after_dongguan = False
|
||||
|
||||
for city_item in city_dict:
|
||||
city = city_item['display']
|
||||
log.info('开始查找' + city + '周边交通')
|
||||
if city == '东莞':
|
||||
after_dongguan = True
|
||||
if not after_dongguan:
|
||||
continue
|
||||
seaweed_df = pd.DataFrame(list(seaweed_conn.find({'city': city, 'cat': 'district', 'status': 0, 'lng': {'$ne': None}},
|
||||
{'city': 1, 'region': 1, 'name': 1, 'lng': 1, 'lat': 1}).batch_size(
|
||||
10000)))
|
||||
|
||||
@@ -27,44 +27,48 @@ def find_around_by_location(city, location):
|
||||
:param location:
|
||||
:return:
|
||||
"""
|
||||
supermarket_df = elastic_client.scan_to_data_frame('amap_poi', {
|
||||
"_source": ["name"],
|
||||
"query": {
|
||||
"bool": {
|
||||
"must_not": [
|
||||
{
|
||||
"term": {
|
||||
"status": {
|
||||
"value": 1
|
||||
try:
|
||||
supermarket_df = elastic_client.scan_to_data_frame('amap_poi', {
|
||||
"_source": ["name"],
|
||||
"query": {
|
||||
"bool": {
|
||||
"must_not": [
|
||||
{
|
||||
"term": {
|
||||
"status": {
|
||||
"value": 1
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"filter": [
|
||||
{"terms": {
|
||||
"typecode": supermarket_typecode
|
||||
}},
|
||||
{
|
||||
"term": {
|
||||
"cityname": {
|
||||
"value": city
|
||||
],
|
||||
"filter": [
|
||||
{"terms": {
|
||||
"typecode": supermarket_typecode
|
||||
}},
|
||||
{
|
||||
"term": {
|
||||
"cityname": {
|
||||
"value": city
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"geo_distance": {
|
||||
"distance": 1000,
|
||||
"location": location
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"geo_distance": {
|
||||
"distance": 1000,
|
||||
"location": location
|
||||
}
|
||||
}
|
||||
]
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
if len(supermarket_df) > 0:
|
||||
return supermarket_df['name'].tolist()
|
||||
return []
|
||||
|
||||
});
|
||||
if len(supermarket_df) > 0:
|
||||
return supermarket_df['name'].tolist()
|
||||
return []
|
||||
except Exception as e:
|
||||
print(e)
|
||||
print(location)
|
||||
return []
|
||||
|
||||
def deal(city, lng, lat):
|
||||
location = [lng, lat]
|
||||
@@ -72,9 +76,16 @@ def deal(city, lng, lat):
|
||||
return supermarket_df
|
||||
|
||||
|
||||
### 临时后续注释
|
||||
after_dongguan = False
|
||||
|
||||
for city_item in city_dict:
|
||||
city = city_item['display']
|
||||
log.info('开始查找' + city + '周边商场')
|
||||
if city == '东莞':
|
||||
after_dongguan = True
|
||||
if not after_dongguan:
|
||||
continue
|
||||
seaweed_df = pd.DataFrame(list(seaweed_conn.find({'city': city, 'cat': 'district', 'status': 0, 'lng': {'$ne': None}},
|
||||
{'city': 1, 'region': 1, 'name': 1, 'lng': 1, 'lat': 1}).batch_size(
|
||||
10000)))
|
||||
|
||||
Reference in New Issue
Block a user