Merge branch 'fix_ml-2' into 'dev'

fix ml 2

See merge request spatial/postamates!125
dev
Timofey Malinin 2 years ago
commit a305972d45

@ -133,6 +133,7 @@ def raschet(table_name='service_placementpoint'):
pts_inf = pts_inf.loc[pts_inf.matching_status == 'New'].reset_index(drop=True)
pts_inf['geometry'] = pts_inf['geometry'].apply(wkb.loads, hex=True)
pts_inf = gpd.GeoDataFrame(pts_inf, geometry='geometry', crs='epsg:4326')
if len(pts_inf) > 0:
pts_inf = pts_inf.to_crs('epsg:32637')
pts_inf['buf'] = pts_inf.buffer(500)
@ -233,6 +234,7 @@ def raschet(table_name='service_placementpoint'):
except Exception as e:
log_to_telegram(f'Ошибка при обновлении полей в базе данных: {e}')
log_to_telegram('Начинается обновление полей в базе')
if len(pts_inf) > 0:
status.status = 'Перерасчет ML: 50%'
status.save()
# Загрузка в базу обновленных значений
@ -319,6 +321,8 @@ def raschet(table_name='service_placementpoint'):
log_to_telegram('end raschet')
status.status = 'Перерасчет ML завершен'
status.save()
LastMLCall.objects.all().delete()
LastMLCall.objects.create()
@shared_task
@ -379,8 +383,7 @@ def load_post_and_pvz(obj_id: int):
status.status = "Завершено"
cache.clear()
status.save()
LastMLCall.objects.all().delete()
LastMLCall.objects.create()
@shared_task()

Loading…
Cancel
Save