diff options
14 files changed, 83 insertions, 82 deletions
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Almacen.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Almacen.java index ab8e989..dd5a815 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Almacen.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Almacen.java @@ -28,22 +28,22 @@ import lombok.Setter; public class Almacen { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idAlmacen", updatable = false, nullable = false) - private int idAlmacen; + @Column(name = "id", updatable = false, nullable = false) + private int id; - @Column(name = "cuidad") - private String cuidad; //nombre del almacen = nombre cuidad + @Column(name = "ciudad") + private String ciudad; //nombre del almacen = nombre cuidad - @Column(name = "posicionX") - private int posicionX; + @Column(name = "latitud") + private double latitud; - @Column(name = "posicionY") - private int posicionY; + @Column(name = "longitud") + private double longitud; @Column(name = "esPrincipal") private boolean esPrincipal; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idRegion") + @JoinColumn(name = "region_fk") private Region region; } diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Averia.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Averia.java index 69d69c3..dae9a24 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Averia.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Averia.java @@ -30,20 +30,20 @@ import lombok.Setter; public class Averia { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idAveria", updatable = false, nullable = false) - private int idAveria; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "descripcion") - private String nombre; + private String descripcion; @Column(name = "fechaRegistro") private Date fechaRegistro; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idCamion") + @JoinColumn(name = "camion_fk") private Camion camion; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idTipoAveria") + @JoinColumn(name = "tipoAveria_fk") private TipoAveria tipoAveria; } diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java index 123ce79..834e2d1 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java @@ -28,20 +28,20 @@ import lombok.Setter; public class Camion { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idCamion", updatable = false, nullable = false) - private int idCamion; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "placa") private String placa; @Column(name = "kilometraje") - private Double kilometraje; + private double kilometraje; @Column(name = "estado") private int estado = 0; //0: @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idTipoCamion") + @JoinColumn(name = "tipoCamion_fk") private TipoCamion tipoCamion; } diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Cliente.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Cliente.java index bea5d13..acb4213 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Cliente.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Cliente.java @@ -25,14 +25,14 @@ import lombok.Setter; public class Cliente { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idCliente", updatable = false, nullable = false) - private int idCliente; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "nombreCompleto") - private String nombreCompleto; + private String nombreCompleto; // Razon Social @Column(name = "dni") - private int dni; + private int dni; // RUC @Column(name = "correo") private String correo; diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/PTG.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/PTG.java index 2a21379..edc4194 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/PTG.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/PTG.java @@ -2,12 +2,7 @@ package pe.edu.pucp.odiparback.models; import java.util.Date; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +import javax.persistence.*; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; @@ -19,7 +14,7 @@ import lombok.Setter; @Entity @Table(name = "ptg") -@SQLDelete(sql = "UPDATE ptg SET activo = 0 WHERE id = ?") +@SQLDelete(sql = "UPDATE PTG SET activo = 0 WHERE id = ?") @Where(clause = "activo = 1") @NoArgsConstructor @AllArgsConstructor @@ -29,12 +24,16 @@ public class PTG { //Plan de transporte Generado @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idPTG", updatable = false, nullable = false) + @Column(name = "id", updatable = false, nullable = false) private int idPTG; - @Column(name = "fechaGenerada") - private Date fechaGenerada; + @Column(name = "fechaGenerado") + private Date fechaGenerado; @Column(name = "esSimulacion") - private boolean esSimulacion; + private boolean esSimulacion; + + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "usuario_fk") + private Usuario usuario_fk; // Usuario que genera } diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Pedido.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Pedido.java index 616aea4..38cd5a7 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Pedido.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Pedido.java @@ -34,33 +34,33 @@ import lombok.Setter; public class Pedido { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idPedido", updatable = false, nullable = false) - private int idPedido; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "cantidad") private int cantidad; @Column(name = "estado") - private int estado; //0: pendiente + private int estado; //0: pendiente - @Column(name = "codigo") - private int codigo; + @Column(name = "codigoPedido") + private int codigoPedido; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idAlmacen") + @JoinColumn(name = "almacen_fk") private Almacen almacen; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idCliente") + @JoinColumn(name = "cliente_fk") private Cliente cliente; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idUsuario") - private Usuario usuarioRegistro; //Usuario que registra + @JoinColumn(name = "usuario_fk") + private Usuario usuarioRegistro; //Usuario que registra @Temporal(TemporalType.TIMESTAMP) @Column(columnDefinition = "DATETIME", nullable = false) - protected Date fechaRegistro = new Date(); + protected Date fechaPedido = new Date(); @Temporal(TemporalType.TIMESTAMP) @Column(columnDefinition = "DATETIME", nullable = false) @@ -73,7 +73,7 @@ public class Pedido { @PrePersist private void onCreate(){ - fechaRegistro=fechaModificacion=addHoursToJavaUtilDate(new Date(), -5); + fechaPedido=fechaPedido=addHoursToJavaUtilDate(new Date(), -5); } public Date addHoursToJavaUtilDate(Date date, int hours) { diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Region.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Region.java index 1341317..b0d4625 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Region.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Region.java @@ -25,8 +25,8 @@ import lombok.Setter; public class Region { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idRegion", updatable = false, nullable = false) - private int idRegion; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "nombre") private String nombre; diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Rol.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Rol.java index a3bc5b5..0be1521 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Rol.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Rol.java @@ -25,8 +25,8 @@ import lombok.Setter; public class Rol { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idRol", updatable = false, nullable = false) - private int idRol; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "nombre") private String nombre; diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java index b1a9368..2bc8ce0 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java @@ -33,28 +33,24 @@ import lombok.Setter; public class Ruta { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idRuta", updatable = false, nullable = false) - private int idRuta; - - @Column(name = "nombre") - private String nombre; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "fechaInicio") private Date fechaInicio; - @Column(name = "fechaFinEst") - private Date fechaFinEst; - - - @Column(name = "fechaFinReal") - private Date fechaFinReal; + @Column(name = "fechaFin") + private Date fechaFin; @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "idTramoRuta") + @JoinColumn(name = "id") private List<TramoRuta> tramoRutas; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idCamion") + @JoinColumn(name = "camion_fk") private Camion camion; + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "PTG_fk") + private PTG ptg; } diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoAveria.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoAveria.java index 92156fd..84488eb 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoAveria.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoAveria.java @@ -27,12 +27,12 @@ import lombok.Setter; public class TipoAveria { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idTipoAveria", updatable = false, nullable = false) - private int idTipoAveria; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "nombre") private String nombre; @Column(name = "duracion") - private Date duracion; + private int duracion; } diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoCamion.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoCamion.java index 608a089..f8aab31 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoCamion.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoCamion.java @@ -25,13 +25,13 @@ import lombok.Setter; public class TipoCamion { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idTipoCamion", updatable = false, nullable = false) - private int idTipoCamion; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "nombre") private String nombre; //Tipo A, B o C - @Column(name = "velocidad") - private Double velocidad; + @Column(name = "capacidad") + private int capacidad; }
\ No newline at end of file diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Tramo.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Tramo.java index 1a615d0..4f1ea69 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Tramo.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Tramo.java @@ -29,20 +29,20 @@ public class Tramo { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "idTramo", updatable = false, nullable = false) - private int idTramo; + private int id; @Column(name = "distancia") private double distancia; - @Column(name = "estado") - private boolean estado; + @Column(name = "estaBloqueado") + private boolean estaBloqueado; // estado @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idAlmacen") + @JoinColumn(name = "almacen1_fk") private Almacen origen; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idAlmacen") + @JoinColumn(name = "almacen2_fk") private Almacen destino; } diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TramoRuta.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TramoRuta.java index 7c55588..a2d9241 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TramoRuta.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TramoRuta.java @@ -21,8 +21,8 @@ import lombok.NoArgsConstructor; import lombok.Setter; @Entity -@Table(name = "tramoRuta") -@SQLDelete(sql = "UPDATE tramoRuta SET activo = 0 WHERE id = ?") +@Table(name = "tramo_ruta") +@SQLDelete(sql = "UPDATE tramo_ruta SET activo = 0 WHERE id = ?") @Where(clause = "activo = 1") @NoArgsConstructor @AllArgsConstructor @@ -30,11 +30,11 @@ import lombok.Setter; public class TramoRuta { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idTramoRuta", updatable = false, nullable = false) - private int idTramoRuta; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "orden") - private int orden; // idk + private int orden; // idk -> Rpta: # de orden en la ruta @Column(name = "paquetesEntregar") private int paquetesEntregar; @@ -52,6 +52,8 @@ public class TramoRuta { private Date horaLlegadaReal; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idTramo") + @JoinColumn(name = "tramo_fk") private Tramo tramo; + + // ruta_fk } diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Usuario.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Usuario.java index b7902ba..9920c12 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Usuario.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Usuario.java @@ -28,8 +28,8 @@ import lombok.Setter; public class Usuario { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "idUsuario", updatable = false, nullable = false) - private int idUsuario; + @Column(name = "id", updatable = false, nullable = false) + private int id; @Column(name = "usuario") private String usuario; @@ -50,6 +50,10 @@ public class Usuario { private String correo; @ManyToOne(fetch = FetchType.EAGER) - @JoinColumn(name = "idRol") + @JoinColumn(name = "creador_fk") + private Usuario creador; + + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "rol_fk") private Rol rol; } |