enrichment_status

dev
AlexP077 2 years ago
parent 3bad22c4e2
commit fa05a712ed

@ -141,8 +141,7 @@ class PointService:
change_status('Шаг 2 из 3 (Обогащение точек).', task_name)
points = models.PrePlacementPoint.objects.filter(matching_status=MatchingStatus.New.name).all()
groups = models.Post_and_pvzGroup.objects.all()
for point in points:
for _i, point in enumerate(points):
origin = point.geometry
qs = models.PlacementPoint.objects.filter(status=PointStatus.Working.name).annotate(
dist=Dist('geometry', origin)).order_by('dist')
@ -262,7 +261,7 @@ class PointService:
for group in groups:
self.calculate_dist_for_group(point, group, instance_type=models.PrePlacementPointPVZDistance)
change_status(
f'Шаг 2 из 3 (Обогащение точек). Обработано {points.filter(matching_status=MatchingStatus.Matched.name).count()} из {points.count()}',
f'Шаг 2 из 3 (Обогащение точек). Обработано {_i} из {points.count()}',
task_name)
run_psql_command()

Loading…
Cancel
Save