diff options
7 files changed, 20 insertions, 10 deletions
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java index 7a17ded..06c3272 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java @@ -23,7 +23,7 @@ public class AlmacenDaoImp implements AlmacenDao { public List<Almacen> getAll() { List<Almacen> resultado = null; try{ - String hql = "FROM almacen "; + String hql = "SELECT * FROM almacen "; resultado = entityManager.createQuery(hql).getResultList(); // String query = "SELECT * FROM almacen"; // resultado = entityManager.createQuery(query).getResultList(); diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java index 00d723d..53fe7de 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java @@ -23,7 +23,7 @@ public class CamionDaoImp implements CamionDao { public List<Camion> getAll() { List<Camion> resultado = null; try{ - String query = "SELECT * FROM camion"; + String query = "FROM Camion order by id "; resultado = entityManager.createQuery(query).getResultList(); } catch(Exception ex){ diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java index 943a085..e429775 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java @@ -23,7 +23,7 @@ public class PedidoDaoImp implements PedidoDao { public List<Pedido> getAll() { List<Pedido> resultado = null; try{ - String query = "SELECT * FROM pedido"; + String query = "FROM Pedido order by id "; resultado = entityManager.createQuery(query).getResultList(); } catch(Exception ex){ 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 4df158b..412a2fd 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 @@ -73,7 +73,7 @@ public class Pedido { @PrePersist private void onCreate(){ - fechaPedido=fechaPedido=addHoursToJavaUtilDate(new Date(), -5); + 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/Ruta.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java index 2bc8ce0..39fd70f 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 @@ -42,10 +42,6 @@ public class Ruta { @Column(name = "fechaFin") private Date fechaFin; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER) - @JoinColumn(name = "id") - private List<TramoRuta> tramoRutas; - @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "camion_fk") private Camion camion; 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 a2d9241..1c71977 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 @@ -22,7 +22,7 @@ import lombok.Setter; @Entity @Table(name = "tramo_ruta") -@SQLDelete(sql = "UPDATE tramo_ruta SET activo = 0 WHERE id = ?") +@SQLDelete(sql = "UPDATE tramoRuta SET activo = 0 WHERE id = ?") @Where(clause = "activo = 1") @NoArgsConstructor @AllArgsConstructor @@ -56,4 +56,7 @@ public class TramoRuta { private Tramo tramo; // ruta_fk + @ManyToOne(fetch = FetchType.EAGER) + @JoinColumn(name = "ruta_fk") + private Ruta ruta; } diff --git a/back/odiparback/src/main/resources/application.properties b/back/odiparback/src/main/resources/application.properties index 6c4feb8..5c476bd 100644 --- a/back/odiparback/src/main/resources/application.properties +++ b/back/odiparback/src/main/resources/application.properties @@ -4,4 +4,15 @@ spring.datasource.username=gabs spring.datasource.password=odiparfront123odiparfront123odiparfront123 spring.datasource.driver-class-name=com.mysql.jdbc.Driver spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect -# com.mysql.cj.jdbc.Driver (new driver)
\ No newline at end of file +# com.mysql.cj.jdbc.Driver (new driver) + +server.port=8083 +spring.datasource.tomcat.max-wait=20000 +spring.datasource.tomcat.max-active=50 +spring.datasource.tomcat.max-idle=20 +spring.datasource.tomcat.min-idle=15 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.jpa.generate-ddl=true +spring.jpa.hibernate.hbm2ddl.auto=update +spring.jpa.hibernate.ddl-auto=update
\ No newline at end of file |