diff options
Diffstat (limited to 'back')
16 files changed, 94 insertions, 9 deletions
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/PTGController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/PTGController.java index adba375..6de270b 100644 --- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/PTGController.java +++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/PTGController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/ptg") +@RequestMapping("/PTG") @CrossOrigin public class PTGController { @Autowired @@ -30,7 +30,7 @@ public class PTGController { } @GetMapping(value = "/{id}") - @Cacheable(value = "ptg",key = "#id") + @Cacheable(value = "PTG",key = "#id") PTG get(@PathVariable int id)throws AuthenticationException{ return ptgService.get(id); } @@ -46,7 +46,7 @@ public class PTGController { } @DeleteMapping(value = "/{id}") - @CacheEvict(value = "ptg", allEntries = true) + @CacheEvict(value = "PTG", allEntries = true) void delete(@PathVariable int id){ ptgService.delete(id); } 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 121b711..1e38ada 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 @@ -13,6 +13,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -31,6 +33,10 @@ public class Almacen { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "ubigeo") private String ubigeo; 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 dae9a24..229db84 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 @@ -15,6 +15,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -33,6 +35,10 @@ public class Averia { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "descripcion") private String descripcion; 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 70e970a..7c66069 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 @@ -33,9 +33,16 @@ public class Camion { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "placa") private String placa; + @Column(name = "codigo") + private String codigo; + @Column(name = "kilometraje") private double kilometraje; 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 acb4213..6115566 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 @@ -10,6 +10,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -28,6 +30,10 @@ public class Cliente { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "nombreCompleto") private String nombreCompleto; // Razon Social 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 edc4194..54b8c17 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 @@ -7,13 +7,15 @@ import javax.persistence.*; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; @Entity -@Table(name = "ptg") +@Table(name = "PTG") @SQLDelete(sql = "UPDATE PTG SET activo = 0 WHERE id = ?") @Where(clause = "activo = 1") @NoArgsConstructor @@ -27,6 +29,10 @@ public class PTG { @Column(name = "id", updatable = false, nullable = false) private int idPTG; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "fechaGenerado") private Date fechaGenerado; 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 412a2fd..7644e4b 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 @@ -19,6 +19,8 @@ import javax.persistence.TemporalType; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -37,6 +39,10 @@ public class Pedido { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "cantidad") private int cantidad; 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 b0d4625..34eedc3 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 @@ -10,6 +10,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -28,6 +30,10 @@ public class Region { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @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 0be1521..afda1a0 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 @@ -10,6 +10,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -28,6 +30,10 @@ public class Rol { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @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 39fd70f..178a403 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 @@ -18,6 +18,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -36,6 +38,10 @@ public class Ruta { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "fechaInicio") private Date fechaInicio; 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 84488eb..a45abcb 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 @@ -12,6 +12,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -29,7 +31,11 @@ public class TipoAveria { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id", updatable = false, nullable = false) private int id; - + + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "nombre") private String nombre; 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 f8aab31..7cecbdf 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 @@ -10,6 +10,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -28,6 +30,10 @@ public class TipoCamion { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "nombre") private String nombre; //Tipo A, B o C 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 4f1ea69..2c8cc89 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 @@ -13,6 +13,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -31,6 +33,10 @@ public class Tramo { @Column(name = "idTramo", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "distancia") private double distancia; 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 1c71977..02b72f6 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 @@ -15,6 +15,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -33,6 +35,10 @@ public class TramoRuta { @Column(name = "id", updatable = false, nullable = false) private int id; + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; + @Column(name = "orden") private int orden; // idk -> Rpta: # de orden en la ruta 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 9920c12..bbd70c1 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 @@ -13,6 +13,8 @@ import javax.persistence.Table; import org.hibernate.annotations.SQLDelete; import org.hibernate.annotations.Where; +import com.fasterxml.jackson.annotation.JsonProperty; + import lombok.AllArgsConstructor; import lombok.Getter; import lombok.NoArgsConstructor; @@ -30,6 +32,10 @@ public class Usuario { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id", updatable = false, nullable = false) private int id; + + @Column(name = "activo") + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + private int activo = 1; @Column(name = "usuario") private String usuario; diff --git a/back/odiparback/src/main/resources/application.properties b/back/odiparback/src/main/resources/application.properties index 21175da..58bbefc 100644 --- a/back/odiparback/src/main/resources/application.properties +++ b/back/odiparback/src/main/resources/application.properties @@ -13,9 +13,9 @@ spring.datasource.tomcat.max-idle=20 spring.datasource.tomcat.min-idle=15 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl +spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + #spring.jpa.generate-ddl=true -#spring.jpa.hibernate.hbm2ddl.auto=none +#spring.jpa.hibernate.hbm2ddl.auto=update #spring.jpa.hibernate.ddl-auto=update - -spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyJpaImpl -spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
\ No newline at end of file |