feat(real-data): carga dinamica de workstations y tickets/movimientos reales desde SQL Server

This commit is contained in:
Carlos Tello
2026-10-13 16:41:20 -03:00
parent c3810a6525
commit e5b2b98d41
17 changed files with 564 additions and 147 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
# ==============================================================================
# OnEverControl - Versión del Backend
# ==============================================================================
__version__ = "0.6.0-beta"
__version__ = "0.6.1-beta"
__app_name__ = "OnEverControl"
__description__ = "Cliente Web Reducido para Puesto de Control en Red Local de OnEverAccess"
+9
View File
@@ -65,6 +65,15 @@ def listar_tickets_activos(
return AccessService.obtener_tickets_activos()
@router.get("/movements/recent", summary="Listar últimos movimientos registrados en SQL Server")
def listar_ultimos_movimientos(
limit: int = Query(30, ge=1, le=100),
current_user: dict = Depends(obtener_usuario_actual),
):
"""Obtiene los últimos movimientos de ingreso y salida registrados en la tabla mvthist."""
return AccessService.obtener_ultimos_movimientos(limite=limit)
@router.get("/people/search", response_model=List[PersonSearchDTO], summary="Búsqueda predictiva de personas")
def buscar_personas(
q: str = Query(..., min_length=2, description="Texto de búsqueda por apellido o documento"),
+32 -13
View File
@@ -1,29 +1,48 @@
# ==============================================================================
# Endpoints de Puestos de Control y Workstations (/api/v1/control-posts)
# ==============================================================================
from typing import List, Dict, Any
from typing import List
from fastapi import APIRouter
from app.schemas.workstation_schema import WorkstationStatusResponse
from app.schemas.workstation_schema import (
WorkstationStatusResponse,
WorkstationConfigResponse,
WorkstationItemDTO,
)
from app.services.workstation_service import WorkstationService
router = APIRouter()
@router.get(
"/workstations",
response_model=List[WorkstationItemDTO],
summary="Listar todas las Workstations reales registradas en SQL Server",
)
async def list_workstations():
"""Listado real de estaciones desde la tabla wks para selector de login."""
return WorkstationService.listar_estaciones_disponibles()
@router.get(
"/{name}/config",
response_model=WorkstationConfigResponse,
summary="Consultar configuración de módulos de carril asignados a la workstation",
)
@router.get(
"/workstation/{name}/config",
response_model=WorkstationConfigResponse,
summary="Consultar configuración de módulos de carril asignados a la workstation (alias)",
)
async def get_workstation_config(name: str):
"""Retorna los módulos de entrada y salida asignados a la estación en wksmdl y mdl."""
return WorkstationService.obtener_config_workstation(name)
@router.get(
"/workstation/{name}/status",
response_model=WorkstationStatusResponse,
summary="Consultar estado y carriles asignados a una Workstation",
summary="Consultar estado y módulos de la Workstation",
)
async def get_workstation_status(name: str):
"""Verifica si la tablet/estación está autorizada como Puesto de Control y retorna sus carriles."""
return WorkstationService.obtener_estado_workstation(name)
@router.get(
"/workstations",
response_model=List[Dict[str, Any]],
summary="Listar todas las Workstations registradas",
)
async def list_workstations():
"""Listado de estaciones para selector de tablets o supervisores."""
return WorkstationService.listar_estaciones_disponibles()
+10 -3
View File
@@ -48,9 +48,16 @@ async def health_check():
)
@app.get("/", tags=["Información"], summary="Información del servicio")
async def root():
"""Ruta raíz informativa."""
from fastapi import Request
from fastapi.responses import FileResponse
@app.get("/", tags=["Información"], summary="Interfaz Web o Información del servicio")
async def root(request: Request):
"""Sirve la aplicación React SPA si está compilada, o metadata JSON."""
accept = request.headers.get("accept", "")
frontend_index = Path(__file__).resolve().parent.parent.parent / "frontend" / "dist" / "index.html"
if "text/html" in accept and frontend_index.is_file():
return FileResponse(frontend_index)
return {
"app": __app_name__,
"version": __version__,
+43 -7
View File
@@ -235,17 +235,17 @@ class AccessRepository:
SELECT
t.TicketID,
t.FechaHoraIngreso,
m.Nombre AS ModuloIngreso,
p.PersonaID,
p.Apellido,
p.Nombre,
d.Documento,
COALESCE(m.Nombre, 'MODULO_ING') AS ModuloIngreso,
COALESCE(p.PersonaID, 0) AS PersonaID,
COALESCE(p.Apellido, 'VISITANTE') AS Apellido,
COALESCE(p.Nombre, '') AS Nombre,
COALESCE(d.Documento, '') AS Documento,
pat.Valor AS Patente,
lot.Valor AS LoteCodigo
FROM tck t
LEFT JOIN mdl m ON t.ModuloIngresoID = m.ModuloID
INNER JOIN tckper tp ON t.TicketID = tp.TicketID AND tp.RolID = 1
INNER JOIN Per p ON tp.PersonaID = p.PersonaID
LEFT JOIN tckper tp ON t.TicketID = tp.TicketID
LEFT JOIN Per p ON tp.PersonaID = p.PersonaID
LEFT JOIN PerDocCatVal d ON p.PersonaID = d.PersonaID
LEFT JOIN tckprx pat ON t.TicketID = pat.TicketID AND pat.PropiedadID = 4
LEFT JOIN tckprx lot ON t.TicketID = lot.TicketID AND lot.PropiedadID = 7
@@ -254,6 +254,42 @@ class AccessRepository:
with db_session() as conn:
cursor = conn.cursor(as_dict=True)
cursor.execute(query)
# Desduplicar por TicketID si hay múltiples ocupantes en el mismo ticket
rows = cursor.fetchall()
seen = set()
unique_tickets = []
for r in rows:
tid = r["TicketID"]
if tid not in seen:
seen.add(tid)
unique_tickets.append(r)
return unique_tickets
@staticmethod
def listar_ultimos_movimientos(limite: int = 50) -> List[Dict[str, Any]]:
"""Retorna los últimos movimientos registrados en mvthist desde SQL Server."""
query = """
SELECT TOP (%s)
m.MvtHistID,
m.TicketID,
m.PersonaID,
p.Apellido,
p.Nombre,
d.Documento,
m.Patente,
m.Sentido,
m.Entidad,
m.FechaHora,
md.Nombre AS ModuloNombre
FROM mvthist m
LEFT JOIN Per p ON m.PersonaID = p.PersonaID
LEFT JOIN PerDocCatVal d ON p.PersonaID = d.PersonaID
LEFT JOIN mdl md ON m.ModuloID = md.ModuloID
ORDER BY m.FechaHora DESC, m.MvtHistID DESC
"""
with db_session() as conn:
cursor = conn.cursor(as_dict=True)
cursor.execute(query, (limite,))
return cursor.fetchall()
@staticmethod
+14
View File
@@ -79,3 +79,17 @@ class LotSearchDTO(BaseModel):
lote_id: int
codigo: str
propietario: Optional[str] = None
class MovementHistoryDTO(BaseModel):
mvt_hist_id: int
ticket_id: int
sentido: str
patente: Optional[str] = None
apellido: Optional[str] = None
nombre: Optional[str] = None
documento: Optional[str] = None
lote_codigo: Optional[str] = None
modulo_nombre: Optional[str] = None
fecha_hora: str
entidad: Optional[str] = None
+44 -4
View File
@@ -1,17 +1,57 @@
# ==============================================================================
# Esquemas Pydantic v2 para Estaciones de Trabajo y Carriles
# ==============================================================================
from typing import List, Optional
from pydantic import BaseModel, Field
from typing import List, Optional, Any
from pydantic import BaseModel, Field, model_validator
class LaneModuleDTO(BaseModel):
modulo_id: int
nombre: str
id: int
name: str
address: int
type: str = "ENTRY"
grupo_modulos: Optional[int] = None
es_entrada: bool = True
duracion_pulso: Optional[int] = None
modulo_id: Optional[int] = None
nombre: Optional[str] = None
@model_validator(mode="before")
@classmethod
def populate_aliases(cls, data: Any):
if isinstance(data, dict):
if "modulo_id" in data and "id" not in data:
data["id"] = data["modulo_id"]
if "id" in data and "modulo_id" not in data:
data["modulo_id"] = data["id"]
if "nombre" in data and "name" not in data:
data["name"] = data["nombre"]
if "name" in data and "nombre" not in data:
data["nombre"] = data["name"]
return data
class WorkstationItemDTO(BaseModel):
id: int
name: str
nombre: Optional[str] = None
@model_validator(mode="before")
@classmethod
def populate_aliases(cls, data: Any):
if isinstance(data, dict):
if "nombre" in data and "name" not in data:
data["name"] = data["nombre"]
if "name" in data and "nombre" not in data:
data["nombre"] = data["name"]
return data
class WorkstationConfigResponse(BaseModel):
id: int
name: str
entry_modules: List[LaneModuleDTO] = Field(default_factory=list)
exit_modules: List[LaneModuleDTO] = Field(default_factory=list)
class WorkstationStatusResponse(BaseModel):
+26
View File
@@ -155,3 +155,29 @@ class AccessService:
)
for f in filas
]
@staticmethod
def obtener_ultimos_movimientos(limite: int = 50) -> List[dict]:
"""Retorna los últimos movimientos reales registrados en SQL Server mvthist."""
from app.schemas.access_schema import MovementHistoryDTO
filas = AccessRepository.listar_ultimos_movimientos(limite)
resultado = []
for f in filas:
fh = f["FechaHora"]
fh_str = fh.strftime("%Y-%m-%d %H:%M:%S") if isinstance(fh, datetime) else str(fh)
resultado.append(
MovementHistoryDTO(
mvt_hist_id=f["MvtHistID"],
ticket_id=f["TicketID"] or 0,
sentido=str(f["Sentido"] or "Ingreso"),
patente=f.get("Patente"),
apellido=f.get("Apellido"),
nombre=f.get("Nombre"),
documento=f.get("Documento"),
lote_codigo=None,
modulo_nombre=f.get("ModuloNombre"),
fecha_hora=fh_str,
entidad=f.get("Entidad"),
)
)
return resultado
+61 -30
View File
@@ -3,50 +3,81 @@
# ==============================================================================
from typing import List, Dict, Any
from app.repositories.workstation_repository import WorkstationRepository
from app.schemas.workstation_schema import WorkstationStatusResponse, LaneModuleDTO
from app.schemas.workstation_schema import (
WorkstationStatusResponse,
WorkstationConfigResponse,
WorkstationItemDTO,
LaneModuleDTO,
)
class WorkstationService:
@staticmethod
def obtener_estado_workstation(name: str) -> WorkstationStatusResponse:
"""Determina si la tablet/workstation está registrada y qué carriles tiene asignados."""
def obtener_config_workstation(name: str) -> WorkstationConfigResponse:
"""Retorna la configuración esperada por el cliente web: id, name, entry_modules, exit_modules."""
wks_row = WorkstationRepository.obtener_workstation_por_nombre(name)
if not wks_row:
return WorkstationStatusResponse(
workstation_name=name,
is_control_post=False,
workstation_id=None,
modules=[],
return WorkstationConfigResponse(
id=0,
name=name,
entry_modules=[],
exit_modules=[],
)
wks_id = wks_row["WorkstationID"]
nombre_oficial = wks_row["Nombre"].strip()
modulos_rows = WorkstationRepository.listar_modulos_por_workstation(wks_id)
modules_dto: List[LaneModuleDTO] = []
for m in modulos_rows:
# Determinamos si es entrada o salida según ModuloEntradaID o nombre
es_entrada = bool(m.get("ModuloEntradaID")) or "ENTRADA" in m["Nombre"].upper()
modules_dto.append(
LaneModuleDTO(
modulo_id=m["ModuloID"],
nombre=m["Nombre"].strip(),
address=m["Address"],
grupo_modulos=m.get("GrupoModulos"),
es_entrada=es_entrada,
duracion_pulso=m.get("duracion_pulso"),
)
)
entry_modules: List[LaneModuleDTO] = []
exit_modules: List[LaneModuleDTO] = []
return WorkstationStatusResponse(
workstation_name=nombre_oficial,
is_control_post=len(modules_dto) > 0,
workstation_id=wks_id,
modules=modules_dto,
for m in modulos_rows:
nom = m["Nombre"].strip()
nom_upper = nom.upper()
if "SALIDA" in nom_upper or "EGRESO" in nom_upper:
es_entrada = False
elif "ENTRADA" in nom_upper or "INGRESO" in nom_upper:
es_entrada = True
else:
es_entrada = not bool(m.get("ModuloEntradaID"))
dto = LaneModuleDTO(
id=m["ModuloID"],
name=nom,
address=m["Address"],
type="ENTRY" if es_entrada else "EXIT",
grupo_modulos=m.get("GrupoModulos"),
es_entrada=es_entrada,
duracion_pulso=m.get("duracion_pulso"),
)
if es_entrada:
entry_modules.append(dto)
else:
exit_modules.append(dto)
return WorkstationConfigResponse(
id=wks_id,
name=nombre_oficial,
entry_modules=entry_modules,
exit_modules=exit_modules,
)
@staticmethod
def listar_estaciones_disponibles() -> List[Dict[str, Any]]:
"""Retorna el listado de todas las workstations disponibles para selección de supervisor."""
def obtener_estado_workstation(name: str) -> WorkstationStatusResponse:
"""Determina si la tablet/workstation está registrada y qué carriles tiene asignados."""
cfg = WorkstationService.obtener_config_workstation(name)
all_modules = cfg.entry_modules + cfg.exit_modules
return WorkstationStatusResponse(
workstation_name=cfg.name,
is_control_post=len(all_modules) > 0,
workstation_id=cfg.id,
modules=all_modules,
)
@staticmethod
def listar_estaciones_disponibles() -> List[WorkstationItemDTO]:
"""Retorna el listado de todas las workstations reales desde la tabla wks de SQL Server."""
rows = WorkstationRepository.listar_todas()
return [{"workstation_id": r["WorkstationID"], "nombre": r["Nombre"].strip()} for r in rows]
return [
WorkstationItemDTO(id=r["WorkstationID"], name=r["Nombre"].strip())
for r in rows
]