forked from TDTP/admin_transporte_backend
Corrige Id Shape Numerico a Varchar
parent
b518f65520
commit
d74971f037
|
@ -283,7 +283,7 @@ if v_error = '' THEN
|
||||||
-----
|
-----
|
||||||
|
|
||||||
insert into gtfs_shape
|
insert into gtfs_shape
|
||||||
select shape_id::numeric,shape_pt_lat::float8,shape_pt_lon::float8,
|
select shape_id,shape_pt_lat::float8,shape_pt_lon::float8,
|
||||||
shape_pt_sequence::numeric,shape_dist_traveled::float8
|
shape_pt_sequence::numeric,shape_dist_traveled::float8
|
||||||
from z_shapes zs;
|
from z_shapes zs;
|
||||||
|
|
||||||
|
@ -305,7 +305,7 @@ if v_error = '' THEN
|
||||||
select
|
select
|
||||||
trip_id,
|
trip_id,
|
||||||
trim(route_id)||'-'||trim(direction_id::varchar) as route_id,
|
trim(route_id)||'-'||trim(direction_id::varchar) as route_id,
|
||||||
shape_id::numeric ,null as regreso, trip_headsign,trip_short_name,direction_id::numeric,service_id::varchar,block_id
|
shape_id ,null as regreso, trip_headsign,trip_short_name,direction_id::numeric,service_id::varchar,block_id
|
||||||
from z_trips zt;
|
from z_trips zt;
|
||||||
|
|
||||||
-----
|
-----
|
||||||
|
|
|
@ -98,7 +98,7 @@ class GtfsRouteType(models.Model):
|
||||||
|
|
||||||
|
|
||||||
class GtfsShape(models.Model):
|
class GtfsShape(models.Model):
|
||||||
id_shape = models.DecimalField(max_digits=18, decimal_places=0)
|
id_shape = models.CharField(max_length=150)
|
||||||
shape_pt_lat = models.FloatField(blank=True, null=True)
|
shape_pt_lat = models.FloatField(blank=True, null=True)
|
||||||
shape_pt_lon = models.FloatField(blank=True, null=True)
|
shape_pt_lon = models.FloatField(blank=True, null=True)
|
||||||
shape_pt_sequence = models.IntegerField(blank=True, null=True)
|
shape_pt_sequence = models.IntegerField(blank=True, null=True)
|
||||||
|
@ -132,7 +132,7 @@ class GtfsStopTimes(models.Model):
|
||||||
class GtfsTrips(models.Model):
|
class GtfsTrips(models.Model):
|
||||||
id_trip = models.CharField(primary_key=True, max_length=150)
|
id_trip = models.CharField(primary_key=True, max_length=150)
|
||||||
id_linea = models.CharField(max_length=150, blank=True, null=True)
|
id_linea = models.CharField(max_length=150, blank=True, null=True)
|
||||||
id_shape = models.IntegerField(blank=True, null=True)
|
id_shape = models.CharField(max_length=150,blank=True, null=True)
|
||||||
id_trip_regreso = models.ForeignKey('self', models.DO_NOTHING, db_column='id_trip_regreso', blank=True, null=True)
|
id_trip_regreso = models.ForeignKey('self', models.DO_NOTHING, db_column='id_trip_regreso', blank=True, null=True)
|
||||||
trip_headsign = models.CharField(max_length=100, blank=True, null=True)
|
trip_headsign = models.CharField(max_length=100, blank=True, null=True)
|
||||||
trip_short_name = models.CharField(max_length=100, blank=True, null=True)
|
trip_short_name = models.CharField(max_length=100, blank=True, null=True)
|
||||||
|
|
|
@ -239,7 +239,7 @@ class LineaViewSet(viewsets.ModelViewSet):
|
||||||
|
|
||||||
|
|
||||||
@action(detail=False, methods=['get'])
|
@action(detail=False, methods=['get'])
|
||||||
def count_buses_recorridos(self, request, pk=None):
|
def count_buses_recorridos_old(self, request, pk=None):
|
||||||
query = "select count(distinct vehicle_license_plate) from gtfs_posiciones"
|
query = "select count(distinct vehicle_license_plate) from gtfs_posiciones"
|
||||||
|
|
||||||
with connection.cursor() as cursor:
|
with connection.cursor() as cursor:
|
||||||
|
@ -247,4 +247,19 @@ class LineaViewSet(viewsets.ModelViewSet):
|
||||||
result = cursor.fetchone()
|
result = cursor.fetchone()
|
||||||
|
|
||||||
return JsonResponse({ 'count': result[0] })
|
return JsonResponse({ 'count': result[0] })
|
||||||
|
|
||||||
|
|
||||||
|
@action(detail=False, methods=['get'])
|
||||||
|
def count_buses_recorridos(self, request, pk=None):
|
||||||
|
|
||||||
|
db_host = getenv('DB_REDIS_HOST')
|
||||||
|
db_port = getenv('DB_REDIS_PORT')
|
||||||
|
r = redis.Redis(host=db_host, port=db_port, decode_responses=True)
|
||||||
|
key = f'stop_id:none'
|
||||||
|
data = r.get(key)
|
||||||
|
data = json.loads(data)
|
||||||
|
unique_vehicle_plates = set(item["vehicle_license_plate"] for item in data)
|
||||||
|
count_unique_vehicle_plates = len(unique_vehicle_plates)
|
||||||
|
return JsonResponse({ 'count': count_unique_vehicle_plates })
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue