|
|
|
|
@ -82,28 +82,28 @@ class PointService:
|
|
|
|
|
matching_status=MatchingStatus.Error.name,
|
|
|
|
|
status=PointStatus.Pending.name)
|
|
|
|
|
problem += 1
|
|
|
|
|
elif cat == 'Подъезд жилого дома':
|
|
|
|
|
houses = models.House.objects.filter(street=response.get('street'),
|
|
|
|
|
house_number=response.get('houseNumber')).values().all()
|
|
|
|
|
for house in houses:
|
|
|
|
|
house.pop('id')
|
|
|
|
|
if house.get('doors') and house.get('doors') > 1:
|
|
|
|
|
house['flat_cnt'] = int(house['flat_cnt'] / house['doors'])
|
|
|
|
|
for _num in range(house['doors']):
|
|
|
|
|
models.PrePlacementPoint.objects.get_or_create(**house, address=addr,
|
|
|
|
|
name=f'Подъезд {_num + 1}',
|
|
|
|
|
matching_status=MatchingStatus.New.name,
|
|
|
|
|
sample_trn=False,
|
|
|
|
|
is_vis=True,category=cat, geometry=wkt,
|
|
|
|
|
status=PointStatus.Pending.name, area=rayon,
|
|
|
|
|
district=rayon.AO)
|
|
|
|
|
else:
|
|
|
|
|
elif cat == 'Подъезд жилого дома' and models.House.objects.filter(street=response.get('street'),
|
|
|
|
|
house_number=response.get('houseNumber')).first():
|
|
|
|
|
house = models.House.objects.filter(street=response.get('street'),
|
|
|
|
|
house_number=response.get('houseNumber')).values().first()
|
|
|
|
|
house.pop('id')
|
|
|
|
|
if house.get('doors') and house.get('doors') > 1:
|
|
|
|
|
house['flat_cnt'] = int(house['flat_cnt'] / house['doors'])
|
|
|
|
|
for _num in range(house['doors']):
|
|
|
|
|
models.PrePlacementPoint.objects.get_or_create(**house, address=addr,
|
|
|
|
|
name=f'Подъезд {_num + 1}',
|
|
|
|
|
matching_status=MatchingStatus.New.name,
|
|
|
|
|
sample_trn=False,
|
|
|
|
|
is_vis=True,category=cat, geometry=wkt,
|
|
|
|
|
status=PointStatus.Pending.name, area=rayon,
|
|
|
|
|
district=rayon.AO)
|
|
|
|
|
else:
|
|
|
|
|
models.PrePlacementPoint.objects.get_or_create(**house, address=addr,
|
|
|
|
|
matching_status=MatchingStatus.New.name,
|
|
|
|
|
sample_trn=False,
|
|
|
|
|
is_vis=True,category=cat, geometry=wkt,
|
|
|
|
|
status=PointStatus.Pending.name, area=rayon,
|
|
|
|
|
district=rayon.AO)
|
|
|
|
|
else:
|
|
|
|
|
models.PrePlacementPoint.objects.get_or_create(address=addr, street=response.get('street'),
|
|
|
|
|
house_number=response.get('houseNumber'),
|
|
|
|
|
|