summaryrefslogtreecommitdiffstats
path: root/back
diff options
context:
space:
mode:
Diffstat (limited to 'back')
-rw-r--r--back/aco-mdvrptw/pom.xml16
-rw-r--r--back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Ant.java33
-rw-r--r--back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Main.java19
-rw-r--r--back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/MultipleAntColonySystem.java4
-rw-r--r--back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/VrptwGraph.java4
-rw-r--r--back/aco-mdvrptw/src/main/java/org/example/Main.java45
-rwxr-xr-x[-rw-r--r--]back/odiparback/mvnw0
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/LecturaArchivos.java71
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/AlmacenController.java55
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/AveriaController.java55
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/CamionController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/ClienteController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/PTGController.java53
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/PedidoController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RegionController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RutaController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TipoAveriaController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TipoCamionController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TramoController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TramoRutaController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/UsuarioController.java54
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/AlmacenDao.java13
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/AveriaDao.java12
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/CamionDao.java13
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/ClienteDao.java13
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/PTGDao.java11
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/PedidoDao.java13
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RegionDao.java13
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RutaDao.java13
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TipoAveriaDao.java13
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TipoCamionDao.java13
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TramoDao.java13
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TramoRutaDao.java11
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/UsuarioDao.java14
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java90
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AveriaDaoImp.java88
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java88
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/ClienteDaoImp.java87
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PTGDaoImp.java87
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java86
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RegionDaoImp.java86
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RutaDaoImp.java86
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoAveriaDaoImp.java86
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoCamionDaoImp.java86
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoDaoImp.java86
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoRutaDaoImp.java87
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/UsuarioDaoImp.java86
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/services/aaa.java1
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Almacen.java24
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Averia.java10
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Camion.java8
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Cliente.java8
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/PTG.java21
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Pedido.java22
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Region.java4
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Rol.java4
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Ruta.java24
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoAveria.java6
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TipoCamion.java8
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Tramo.java10
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/TramoRuta.java15
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/models/Usuario.java10
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/AlmacenService.java33
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/AveriaService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/CamionService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/ClienteService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/PTGService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/PedidoService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RegionService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RutaService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TipoAveriaService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TipoCamionService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TramoRutaService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TramoService.java32
-rw-r--r--back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/UsuarioService.java32
-rw-r--r--back/odiparback/src/main/resources/application.properties17
-rw-r--r--back/sql/20220601dump.sampledata.sql85
-rw-r--r--back/sql/20220601dump.tables+views.sql245
-rw-r--r--back/sql/some_views_and_selects.sql47
-rw-r--r--back/sql/ss_20220531_221843.pngbin0 -> 99151 bytes
80 files changed, 3090 insertions, 85 deletions
diff --git a/back/aco-mdvrptw/pom.xml b/back/aco-mdvrptw/pom.xml
new file mode 100644
index 0000000..29293bc
--- /dev/null
+++ b/back/aco-mdvrptw/pom.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.example</groupId>
+ <artifactId>aco-mdvrptw</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+ <properties>
+ <maven.compiler.source>17</maven.compiler.source>
+ <maven.compiler.target>17</maven.compiler.target>
+ </properties>
+
+</project> \ No newline at end of file
diff --git a/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Ant.java b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Ant.java
new file mode 100644
index 0000000..f422f31
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Ant.java
@@ -0,0 +1,33 @@
+package com.odiparpack.acovrp;
+
+import java.util.ArrayList;
+
+public class Ant {
+ // graph
+ public int current_index;
+ public double vehicle_load;
+ public double vehicle_travel_time;
+ ArrayList<Integer> travel_path;
+ ArrayList<Integer> index_to_visit;
+ double total_travel_distance;
+
+ public Ant() {
+ travel_path = new ArrayList<>();
+ index_to_visit = new ArrayList<>();
+ }
+
+ public static void main(String[] args) {
+ int i = 0;
+ Ant a = new Ant();
+
+ for (i = 0; i < 100; i++) {
+ a.travel_path.add(100 - i);
+ }
+
+ for (i = 0; i < 100; i++) {
+ System.out.format("%d\n", a.travel_path.get(i));
+ }
+ System.out.println(a.travel_path);
+ System.out.println(a);
+ }
+}
diff --git a/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Main.java b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Main.java
new file mode 100644
index 0000000..33320bc
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/Main.java
@@ -0,0 +1,19 @@
+package com.odiparpack.acovrp;
+
+public class Main {
+ public static void basic_aco() {
+
+ }
+
+ public static void vrptw_aco_figure() {
+
+ }
+
+ public static void example1() {
+
+ }
+
+ public static void main(String[] args) {
+ example1();
+ }
+}
diff --git a/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/MultipleAntColonySystem.java b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/MultipleAntColonySystem.java
new file mode 100644
index 0000000..8ece5aa
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/MultipleAntColonySystem.java
@@ -0,0 +1,4 @@
+package com.odiparpack.acovrp;
+
+public class MultipleAntColonySystem {
+}
diff --git a/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/VrptwGraph.java b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/VrptwGraph.java
new file mode 100644
index 0000000..9ee546b
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/com/odiparpack/acovrp/VrptwGraph.java
@@ -0,0 +1,4 @@
+package com.odiparpack.acovrp;
+
+public class VrptwGraph {
+}
diff --git a/back/aco-mdvrptw/src/main/java/org/example/Main.java b/back/aco-mdvrptw/src/main/java/org/example/Main.java
new file mode 100644
index 0000000..ce5a91a
--- /dev/null
+++ b/back/aco-mdvrptw/src/main/java/org/example/Main.java
@@ -0,0 +1,45 @@
+package org.example;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public class Main {
+ public static void main(String[] args) {
+ String command = "pwd && date && ls ~";
+ command = "~/.odiparpack";
+ try {
+ System.out.println(
+ System.getProperty("os.name") + "\n" +
+ System.getProperty("user.name")
+ );
+ ProcessBuilder pb
+ = new ProcessBuilder("sh", "-c", command);
+ pb.directory(
+ new File(System.getProperty("user.home"))
+ );
+ Process process = pb.start();
+
+ StringBuilder output = new StringBuilder();
+ BufferedReader reader
+ = new BufferedReader(new InputStreamReader(
+ process.getInputStream()
+ ));
+ String line;
+ while ((line = reader.readLine()) != null) {
+ output.append(line + '\n');
+ }
+ int exitVal = process.waitFor();
+ if (exitVal == 0) {
+ System.out.println("The output is:");
+ System.out.println(output);
+ //System.exit(0);
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+} \ No newline at end of file
diff --git a/back/odiparback/mvnw b/back/odiparback/mvnw
index 8a8fb22..8a8fb22 100644..100755
--- a/back/odiparback/mvnw
+++ b/back/odiparback/mvnw
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/LecturaArchivos.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/LecturaArchivos.java
new file mode 100644
index 0000000..10d6a63
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/LecturaArchivos.java
@@ -0,0 +1,71 @@
+package pe.edu.pucp.odiparback;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.Scanner;
+import java.io.PrintWriter;
+
+public class LecturaArchivos {
+ public static void main(String[] args) {
+ File file_oficinas = new File("C:\\Users\\DAYANA\\Desktop\\2022-1\\Desarrollo_de_programas_1\\DP1_project\\data\\raw\\inf226.oficinas.txt");
+ File file_tramos = new File("C:\\Users\\DAYANA\\Desktop\\2022-1\\Desarrollo_de_programas_1\\DP1_project\\data\\raw\\inf226.tramos.txt");
+ Scanner scanner;
+ try {
+ //se pasa el flujo al objeto scanner
+ PrintWriter writer = new PrintWriter(new File("Oficinas.csv"));
+ scanner = new Scanner(file_oficinas);
+ while (scanner.hasNextLine()) {
+ // el objeto scanner lee linea a linea desde el archivo
+ String linea = scanner.nextLine();
+
+ String [] oficina = linea.split(",");
+ //System.out.println(oficina[0]+" "+oficina[1]+" "+oficina[2]+" "+ oficina[3]+" "+oficina[4]+" "+oficina[5]+"\n");
+
+ StringBuilder sb = new StringBuilder();
+ for(String str: oficina){
+ sb.append(str);
+ sb.append(",");
+ }
+ //System.out.println(oficina[1]=="AMAZONAS" );
+ if(oficina[1]=="LIMA" && oficina[2]=="LIMA") sb.append("1");
+ else sb.append("0");
+
+ sb.append("\n");
+ writer.write(sb.toString());
+ }
+ //se cierra el ojeto scanner
+ scanner.close();
+ writer.close();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+
+
+ try {
+ //se pasa el flujo al objeto scanner
+ PrintWriter writer = new PrintWriter(new File("Tramos.csv"));
+ scanner = new Scanner(file_tramos);
+ while (scanner.hasNextLine()) {
+ // el objeto scanner lee linea a linea desde el archivo
+ String linea = scanner.nextLine();
+
+ String [] tramo = linea.split("=>");
+ tramo[0]=tramo[0].replace(" ", "");
+ tramo[1]=tramo[1].replace(" ", "");
+ //System.out.println(tramo[0]+tramo[1]+"\n");
+
+ StringBuilder sb = new StringBuilder();
+
+ sb.append(tramo[0]);
+ sb.append(",");
+ sb.append(tramo[1]);
+ sb.append("\n");
+ writer.write(sb.toString());
+ }
+ //se cierra el ojeto scanner
+ scanner.close();
+ writer.close();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/AlmacenController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/AlmacenController.java
new file mode 100644
index 0000000..e8d32a0
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/AlmacenController.java
@@ -0,0 +1,55 @@
+package pe.edu.pucp.odiparback.controllers;
+
+import pe.edu.pucp.odiparback.models.Almacen;
+import pe.edu.pucp.odiparback.services.AlmacenService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/almacen")
+@CrossOrigin
+public class AlmacenController {
+ @Autowired
+ AlmacenService almacenService;
+
+ @GetMapping(value = "/")
+ List<Almacen> getAll(){
+ return almacenService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "almacen",key = "#id")
+ Almacen get(@PathVariable int id)throws AuthenticationException{
+ return almacenService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody Almacen almacen)throws SQLException{
+ almacenService.register(almacen);
+ }
+
+ @PutMapping(value = "/")
+ Almacen update(@RequestBody Almacen almacen)throws SQLException{
+ return almacenService.update(almacen);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "almacen", allEntries = true)
+ void delete(@PathVariable int id){
+ almacenService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/AveriaController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/AveriaController.java
new file mode 100644
index 0000000..f5555d6
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/AveriaController.java
@@ -0,0 +1,55 @@
+package pe.edu.pucp.odiparback.controllers;
+
+import pe.edu.pucp.odiparback.models.Averia;
+import pe.edu.pucp.odiparback.services.AveriaService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/averia")
+@CrossOrigin
+public class AveriaController {
+ @Autowired
+ AveriaService averiaService;
+
+ @GetMapping(value = "/")
+ List<Averia> getAll(){
+ return averiaService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "averia",key = "#id")
+ Averia get(@PathVariable int id)throws AuthenticationException{
+ return averiaService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody Averia averia)throws SQLException{
+ averiaService.register(averia);
+ }
+
+ @PutMapping(value = "/")
+ Averia update(@RequestBody Averia averia)throws SQLException{
+ return averiaService.update(averia);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "averia", allEntries = true)
+ void delete(@PathVariable int id){
+ averiaService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/CamionController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/CamionController.java
new file mode 100644
index 0000000..59336b5
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/CamionController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.Camion;
+import pe.edu.pucp.odiparback.services.CamionService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/camion")
+@CrossOrigin
+public class CamionController {
+ @Autowired
+ CamionService camionService;
+
+ @GetMapping(value = "/")
+ List<Camion> getAll(){
+ return camionService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "camion",key = "#id")
+ Camion get(@PathVariable int id)throws AuthenticationException{
+ return camionService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody Camion camion)throws SQLException{
+ camionService.register(camion);
+ }
+
+ @PutMapping(value = "/")
+ Camion update(@RequestBody Camion camion)throws SQLException{
+ return camionService.update(camion);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "camion", allEntries = true)
+ void delete(@PathVariable int id){
+ camionService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/ClienteController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/ClienteController.java
new file mode 100644
index 0000000..c3e0b6d
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/ClienteController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.Cliente;
+import pe.edu.pucp.odiparback.services.ClienteService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/cliente")
+@CrossOrigin
+public class ClienteController {
+ @Autowired
+ ClienteService clienteService;
+
+ @GetMapping(value = "/")
+ List<Cliente> getAll(){
+ return clienteService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "cliente",key = "#id")
+ Cliente get(@PathVariable int id)throws AuthenticationException{
+ return clienteService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody Cliente cliente)throws SQLException{
+ clienteService.register(cliente);
+ }
+
+ @PutMapping(value = "/")
+ Cliente update(@RequestBody Cliente cliente)throws SQLException{
+ return clienteService.update(cliente);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "cliente", allEntries = true)
+ void delete(@PathVariable int id){
+ clienteService.delete(id);
+ }
+
+}
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
new file mode 100644
index 0000000..adba375
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/PTGController.java
@@ -0,0 +1,53 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.PTG;
+import pe.edu.pucp.odiparback.services.PTGService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/ptg")
+@CrossOrigin
+public class PTGController {
+ @Autowired
+ PTGService ptgService;
+
+ @GetMapping(value = "/")
+ List<PTG> getAll(){
+ return ptgService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "ptg",key = "#id")
+ PTG get(@PathVariable int id)throws AuthenticationException{
+ return ptgService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody PTG ptg)throws SQLException{
+ ptgService.register(ptg);
+ }
+
+ @PutMapping(value = "/")
+ PTG update(@RequestBody PTG ptg)throws SQLException{
+ return ptgService.update(ptg);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @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/controllers/PedidoController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/PedidoController.java
new file mode 100644
index 0000000..a1a6c2e
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/PedidoController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.Pedido;
+import pe.edu.pucp.odiparback.services.PedidoService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/pedido")
+@CrossOrigin
+public class PedidoController {
+ @Autowired
+ PedidoService pedidoService;
+
+ @GetMapping(value = "/")
+ List<Pedido> getAll(){
+ return pedidoService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "pedido",key = "#id")
+ Pedido get(@PathVariable int id)throws AuthenticationException{
+ return pedidoService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody Pedido pedido)throws SQLException{
+ pedidoService.register(pedido);
+ }
+
+ @PutMapping(value = "/")
+ Pedido update(@RequestBody Pedido pedido)throws SQLException{
+ return pedidoService.update(pedido);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "pedido", allEntries = true)
+ void delete(@PathVariable int id){
+ pedidoService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RegionController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RegionController.java
new file mode 100644
index 0000000..a55e68d
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RegionController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.Region;
+import pe.edu.pucp.odiparback.services.RegionService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/region")
+@CrossOrigin
+public class RegionController {
+ @Autowired
+ RegionService regionService;
+
+ @GetMapping(value = "/")
+ List<Region> getAll(){
+ return regionService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "region",key = "#id")
+ Region get(@PathVariable int id)throws AuthenticationException{
+ return regionService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody Region region)throws SQLException{
+ regionService.register(region);
+ }
+
+ @PutMapping(value = "/")
+ Region update(@RequestBody Region region)throws SQLException{
+ return regionService.update(region);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "region", allEntries = true)
+ void delete(@PathVariable int id){
+ regionService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RutaController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RutaController.java
new file mode 100644
index 0000000..096013a
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RutaController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.Ruta;
+import pe.edu.pucp.odiparback.services.RutaService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/ruta")
+@CrossOrigin
+public class RutaController {
+ @Autowired
+ RutaService rutaService;
+
+ @GetMapping(value = "/")
+ List<Ruta> getAll(){
+ return rutaService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "ruta",key = "#id")
+ Ruta get(@PathVariable int id)throws AuthenticationException{
+ return rutaService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody Ruta ruta)throws SQLException{
+ rutaService.register(ruta);
+ }
+
+ @PutMapping(value = "/")
+ Ruta update(@RequestBody Ruta ruta)throws SQLException{
+ return rutaService.update(ruta);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "ruta", allEntries = true)
+ void delete(@PathVariable int id){
+ rutaService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TipoAveriaController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TipoAveriaController.java
new file mode 100644
index 0000000..d66f813
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TipoAveriaController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.TipoAveria;
+import pe.edu.pucp.odiparback.services.TipoAveriaService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/tipoAveria")
+@CrossOrigin
+public class TipoAveriaController {
+ @Autowired
+ TipoAveriaService tipoAveriaService;
+
+ @GetMapping(value = "/")
+ List<TipoAveria> getAll(){
+ return tipoAveriaService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "tipoAveria",key = "#id")
+ TipoAveria get(@PathVariable int id)throws AuthenticationException{
+ return tipoAveriaService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody TipoAveria tipoAveria)throws SQLException{
+ tipoAveriaService.register(tipoAveria);
+ }
+
+ @PutMapping(value = "/")
+ TipoAveria update(@RequestBody TipoAveria tipoAveria)throws SQLException{
+ return tipoAveriaService.update(tipoAveria);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "tipoAveria", allEntries = true)
+ void delete(@PathVariable int id){
+ tipoAveriaService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TipoCamionController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TipoCamionController.java
new file mode 100644
index 0000000..72beae9
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TipoCamionController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.TipoCamion;
+import pe.edu.pucp.odiparback.services.TipoCamionService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/tipoCamion")
+@CrossOrigin
+public class TipoCamionController {
+ @Autowired
+ TipoCamionService tipoCamionService;
+
+ @GetMapping(value = "/")
+ List<TipoCamion> getAll(){
+ return tipoCamionService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "tipoCamion",key = "#id")
+ TipoCamion get(@PathVariable int id)throws AuthenticationException{
+ return tipoCamionService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody TipoCamion tipoCamion)throws SQLException{
+ tipoCamionService.register(tipoCamion);
+ }
+
+ @PutMapping(value = "/")
+ TipoCamion update(@RequestBody TipoCamion tipoCamion)throws SQLException{
+ return tipoCamionService.update(tipoCamion);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "tipoCamion", allEntries = true)
+ void delete(@PathVariable int id){
+ tipoCamionService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TramoController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TramoController.java
new file mode 100644
index 0000000..05606ad
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TramoController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.Tramo;
+import pe.edu.pucp.odiparback.services.TramoService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/tramo")
+@CrossOrigin
+public class TramoController {
+ @Autowired
+ TramoService tramoService;
+
+ @GetMapping(value = "/")
+ List<Tramo> getAll(){
+ return tramoService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "tramo",key = "#id")
+ Tramo get(@PathVariable int id)throws AuthenticationException{
+ return tramoService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody Tramo tramo)throws SQLException{
+ tramoService.register(tramo);
+ }
+
+ @PutMapping(value = "/")
+ Tramo update(@RequestBody Tramo tramo)throws SQLException{
+ return tramoService.update(tramo);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "tramo", allEntries = true)
+ void delete(@PathVariable int id){
+ tramoService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TramoRutaController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TramoRutaController.java
new file mode 100644
index 0000000..9c37098
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/TramoRutaController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.TramoRuta;
+import pe.edu.pucp.odiparback.services.TramoRutaService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/tramoRuta")
+@CrossOrigin
+public class TramoRutaController {
+ @Autowired
+ TramoRutaService tramoRutaService;
+
+ @GetMapping(value = "/")
+ List<TramoRuta> getAll(){
+ return tramoRutaService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "tramo",key = "#id")
+ TramoRuta get(@PathVariable int id)throws AuthenticationException{
+ return tramoRutaService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody TramoRuta tramoRuta)throws SQLException{
+ tramoRutaService.register(tramoRuta);
+ }
+
+ @PutMapping(value = "/")
+ TramoRuta update(@RequestBody TramoRuta tramoRuta)throws SQLException{
+ return tramoRutaService.update(tramoRuta);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "tramoRuta", allEntries = true)
+ void delete(@PathVariable int id){
+ tramoRutaService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/UsuarioController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/UsuarioController.java
new file mode 100644
index 0000000..aaa9038
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/UsuarioController.java
@@ -0,0 +1,54 @@
+package pe.edu.pucp.odiparback.controllers;
+import pe.edu.pucp.odiparback.models.Usuario;
+import pe.edu.pucp.odiparback.services.UsuarioService;
+import java.sql.SQLException;
+import java.util.List;
+import org.apache.tomcat.websocket.AuthenticationException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/usuario")
+@CrossOrigin
+public class UsuarioController {
+ @Autowired
+ UsuarioService usuarioService;
+
+ @GetMapping(value = "/")
+ List<Usuario> getAll(){
+ return usuarioService.getAll();
+ }
+
+ @GetMapping(value = "/{id}")
+ @Cacheable(value = "usuario",key = "#id")
+ Usuario get(@PathVariable int id)throws AuthenticationException{
+ return usuarioService.get(id);
+ }
+
+ @PostMapping(value = "/")
+ void register(@RequestBody Usuario usuario)throws SQLException{
+ usuarioService.register(usuario);
+ }
+
+ @PutMapping(value = "/")
+ Usuario update(@RequestBody Usuario usuario)throws SQLException{
+ return usuarioService.update(usuario);
+ }
+
+ @DeleteMapping(value = "/{id}")
+ @CacheEvict(value = "usuario", allEntries = true)
+ void delete(@PathVariable int id){
+ usuarioService.delete(id);
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/AlmacenDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/AlmacenDao.java
new file mode 100644
index 0000000..e728313
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/AlmacenDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Almacen;
+
+
+public interface AlmacenDao {
+ public List<Almacen> getAll();
+ public Almacen get(int id);
+ public void register(Almacen almacen);
+ public Almacen update(Almacen almacen);
+ public void delete(int id);
+} \ No newline at end of file
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/AveriaDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/AveriaDao.java
new file mode 100644
index 0000000..ebd56d3
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/AveriaDao.java
@@ -0,0 +1,12 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Averia;
+
+public interface AveriaDao {
+ public List<Averia> getAll();
+ public Averia get(int id);
+ public void register(Averia averia);
+ public Averia update(Averia averia);
+ public void delete(int id);
+} \ No newline at end of file
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/CamionDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/CamionDao.java
new file mode 100644
index 0000000..d1a81f1
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/CamionDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Camion;
+
+
+public interface CamionDao {
+ public List<Camion> getAll();
+ public Camion get(int id);
+ public void register(Camion camion);
+ public Camion update(Camion camion);
+ public void delete(int id);
+} \ No newline at end of file
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/ClienteDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/ClienteDao.java
new file mode 100644
index 0000000..531f02c
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/ClienteDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Cliente;
+
+
+public interface ClienteDao {
+ public List<Cliente> getAll();
+ public Cliente get(int id);
+ public void register(Cliente cliente);
+ public Cliente update(Cliente cliente);
+ public void delete(int id);
+} \ No newline at end of file
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/PTGDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/PTGDao.java
new file mode 100644
index 0000000..ca6f5b0
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/PTGDao.java
@@ -0,0 +1,11 @@
+package pe.edu.pucp.odiparback.dao;
+import java.util.List;
+import pe.edu.pucp.odiparback.models.PTG;
+
+public interface PTGDao {
+ public List<PTG> getAll();
+ public PTG get(int id);
+ public void register(PTG planTransporte);
+ public PTG update(PTG planTransporte);
+ public void delete(int id);
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/PedidoDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/PedidoDao.java
new file mode 100644
index 0000000..2b619ab
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/PedidoDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Pedido;
+
+
+public interface PedidoDao {
+ public List<Pedido> getAll();
+ public Pedido get(int id);
+ public void register(Pedido pedido);
+ public Pedido update(Pedido pedido);
+ public void delete(int id);
+} \ No newline at end of file
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RegionDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RegionDao.java
new file mode 100644
index 0000000..b4673e1
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RegionDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Region;
+
+
+public interface RegionDao {
+ public List<Region> getAll();
+ public Region get(int id);
+ public void register(Region region);
+ public Region update(Region region);
+ public void delete(int id);
+} \ No newline at end of file
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RutaDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RutaDao.java
new file mode 100644
index 0000000..9dd79d5
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RutaDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Ruta;
+
+
+public interface RutaDao {
+ public List<Ruta> getAll();
+ public Ruta get(int id);
+ public void register(Ruta ruta);
+ public Ruta update(Ruta ruta);
+ public void delete(int id);
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TipoAveriaDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TipoAveriaDao.java
new file mode 100644
index 0000000..2d98140
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TipoAveriaDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.TipoAveria;
+
+
+public interface TipoAveriaDao {
+ public List<TipoAveria> getAll();
+ public TipoAveria get(int id);
+ public void register(TipoAveria tipoAveria);
+ public TipoAveria update(TipoAveria tipoAveria);
+ public void delete(int id);
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TipoCamionDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TipoCamionDao.java
new file mode 100644
index 0000000..4340dfc
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TipoCamionDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.TipoCamion;
+
+
+public interface TipoCamionDao {
+ public List<TipoCamion> getAll();
+ public TipoCamion get(int id);
+ public void register(TipoCamion tipoCamion);
+ public TipoCamion update(TipoCamion tipoCamion);
+ public void delete(int id);
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TramoDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TramoDao.java
new file mode 100644
index 0000000..ddd573e
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TramoDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Tramo;
+
+
+public interface TramoDao {
+ public List<Tramo> getAll();
+ public Tramo get(int id);
+ public void register(Tramo tramo);
+ public Tramo update(Tramo tramo);
+ public void delete(int id);
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TramoRutaDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TramoRutaDao.java
new file mode 100644
index 0000000..5186bc5
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/TramoRutaDao.java
@@ -0,0 +1,11 @@
+package pe.edu.pucp.odiparback.dao;
+import java.util.List;
+import pe.edu.pucp.odiparback.models.TramoRuta;
+
+public interface TramoRutaDao {
+ public List<TramoRuta> getAll();
+ public TramoRuta get(int id);
+ public void register(TramoRuta tramoRuta);
+ public TramoRuta update(TramoRuta tramoRuta);
+ public void delete(int id);
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/UsuarioDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/UsuarioDao.java
new file mode 100644
index 0000000..b8b5eca
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/UsuarioDao.java
@@ -0,0 +1,14 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Usuario;
+
+
+public interface UsuarioDao {
+ public List<Usuario> getAll();
+ public Usuario get(int id);
+ public void register(Usuario usuario);
+ public Usuario update(Usuario usuario);
+ public void delete(int id);
+}
+
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
new file mode 100644
index 0000000..52d8486
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
@@ -0,0 +1,90 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.Almacen;
+import pe.edu.pucp.odiparback.dao.AlmacenDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class AlmacenDaoImp implements AlmacenDao {
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<Almacen> getAll() {
+ List<Almacen> resultado = null;
+ try{
+ String hql = "FROM Almacen order by id";
+ resultado = entityManager.createQuery(hql).getResultList();
+
+// String query = "SELECT * FROM almacen";
+// resultado = entityManager.createQuery(query).getResultList();
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public Almacen get(int id) {
+ Almacen resultado = null;
+ try {
+ resultado = entityManager.find(Almacen.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(Almacen almacen) {
+ try {
+ entityManager.merge(almacen);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ }
+
+ @Transactional
+ @Override
+ public Almacen update(Almacen almacen) {
+ try {
+ entityManager.merge(almacen);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return almacen;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ Almacen resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AveriaDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AveriaDaoImp.java
new file mode 100644
index 0000000..b3090aa
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AveriaDaoImp.java
@@ -0,0 +1,88 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.Averia;
+import pe.edu.pucp.odiparback.dao.AveriaDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class AveriaDaoImp implements AveriaDao{
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<Averia> getAll() {
+ List<Averia> resultado = null;
+ try{
+ String query = "FROM Averia";
+ resultado = entityManager.createQuery(query).getResultList();
+
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public Averia get(int id) {
+ Averia resultado = null;
+ try {
+ resultado = entityManager.find(Averia.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(Averia averia) {
+ try {
+ entityManager.merge(averia);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ }
+
+ @Transactional
+ @Override
+ public Averia update(Averia averia) {
+ try {
+ entityManager.merge(averia);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return averia;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ Averia resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ }
+
+}
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
new file mode 100644
index 0000000..15e3510
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/CamionDaoImp.java
@@ -0,0 +1,88 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.Camion;
+import pe.edu.pucp.odiparback.dao.CamionDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class CamionDaoImp implements CamionDao {
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<Camion> getAll() {
+ List<Camion> resultado = null;
+ try{
+ String query = "FROM Camion order by id ";
+ resultado = entityManager.createQuery(query).getResultList();
+
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public Camion get(int id) {
+ Camion resultado = null;
+ try {
+ resultado = entityManager.find(Camion.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(Camion camion) {
+ try {
+ entityManager.merge(camion);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ }
+
+ @Transactional
+ @Override
+ public Camion update(Camion camion) {
+ try {
+ entityManager.merge(camion);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return camion;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ Camion resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/ClienteDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/ClienteDaoImp.java
new file mode 100644
index 0000000..07831ae
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/ClienteDaoImp.java
@@ -0,0 +1,87 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.Cliente;
+import pe.edu.pucp.odiparback.dao.ClienteDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class ClienteDaoImp implements ClienteDao {
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<Cliente> getAll() {
+ List<Cliente> resultado = null;
+ try{
+ String query = "FROM Cliente";
+ resultado = entityManager.createQuery(query).getResultList();
+
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public Cliente get(int id) {
+ Cliente resultado = null;
+ try {
+ resultado = entityManager.find(Cliente.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(Cliente cliente) {
+ try {
+ entityManager.merge(cliente);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ }
+
+ @Transactional
+ @Override
+ public Cliente update(Cliente cliente) {
+ try {
+ entityManager.merge(cliente);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return cliente;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ Cliente resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PTGDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PTGDaoImp.java
new file mode 100644
index 0000000..6614eb4
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PTGDaoImp.java
@@ -0,0 +1,87 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.PTG;
+import pe.edu.pucp.odiparback.dao.PTGDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class PTGDaoImp implements PTGDao{
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<PTG> getAll() {
+ List<PTG> resultado = null;
+ try{
+ String query = "FROM PTG";
+ resultado = entityManager.createQuery(query).getResultList();
+ // System.out.println(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public PTG get(int id) {
+ PTG resultado = null;
+ try {
+ resultado = entityManager.find(PTG.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(PTG planTransporte) {
+ try {
+ entityManager.merge(planTransporte);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ }
+
+ @Transactional
+ @Override
+ public PTG update(PTG planTransporte) {
+ try {
+ entityManager.merge(planTransporte);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return planTransporte;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ PTG resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
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
new file mode 100644
index 0000000..5fef368
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java
@@ -0,0 +1,86 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.Pedido;
+import pe.edu.pucp.odiparback.dao.PedidoDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class PedidoDaoImp implements PedidoDao {
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<Pedido> getAll() {
+ List<Pedido> resultado = null;
+ try{
+ String query = "FROM Pedido order by id ";
+ resultado = entityManager.createQuery(query).getResultList();
+ // System.out.println(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public Pedido get(int id) {
+ Pedido resultado = null;
+ try {
+ resultado = entityManager.find(Pedido.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(Pedido pedido) {
+ try {
+ entityManager.merge(pedido);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+ @Transactional
+ @Override
+ public Pedido update(Pedido pedido) {
+ try {
+ entityManager.merge(pedido);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return pedido;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ Pedido resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RegionDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RegionDaoImp.java
new file mode 100644
index 0000000..d9e0d08
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RegionDaoImp.java
@@ -0,0 +1,86 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.Region;
+import pe.edu.pucp.odiparback.dao.RegionDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class RegionDaoImp implements RegionDao {
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<Region> getAll() {
+ List<Region> resultado = null;
+ try{
+ String query = "FROM Region";
+ resultado = entityManager.createQuery(query).getResultList();
+ // System.out.println(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public Region get(int id) {
+ Region resultado = null;
+ try {
+ resultado = entityManager.find(Region.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(Region region) {
+ try {
+ entityManager.merge(region);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+ @Transactional
+ @Override
+ public Region update(Region region) {
+ try {
+ entityManager.merge(region);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return region;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ Region resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RutaDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RutaDaoImp.java
new file mode 100644
index 0000000..96b7f3b
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RutaDaoImp.java
@@ -0,0 +1,86 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.Ruta;
+import pe.edu.pucp.odiparback.dao.RutaDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class RutaDaoImp implements RutaDao {
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<Ruta> getAll() {
+ List<Ruta> resultado = null;
+ try{
+ String query = "FROM Ruta";
+ resultado = entityManager.createQuery(query).getResultList();
+ // System.out.println(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public Ruta get(int id) {
+ Ruta resultado = null;
+ try {
+ resultado = entityManager.find(Ruta.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(Ruta ruta) {
+ try {
+ entityManager.merge(ruta);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+ @Transactional
+ @Override
+ public Ruta update(Ruta ruta) {
+ try {
+ entityManager.merge(ruta);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return ruta;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ Ruta resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoAveriaDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoAveriaDaoImp.java
new file mode 100644
index 0000000..6bab82f
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoAveriaDaoImp.java
@@ -0,0 +1,86 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.TipoAveria;
+import pe.edu.pucp.odiparback.dao.TipoAveriaDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class TipoAveriaDaoImp implements TipoAveriaDao{
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<TipoAveria> getAll() {
+ List<TipoAveria> resultado = null;
+ try{
+ String query = "FROM TipoAveria";
+ resultado = entityManager.createQuery(query).getResultList();
+ // System.out.println(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public TipoAveria get(int id) {
+ TipoAveria resultado = null;
+ try {
+ resultado = entityManager.find(TipoAveria.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(TipoAveria tipoAveria) {
+ try {
+ entityManager.merge(tipoAveria);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+ @Transactional
+ @Override
+ public TipoAveria update(TipoAveria tipoAveria) {
+ try {
+ entityManager.merge(tipoAveria);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return tipoAveria;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ TipoAveria resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoCamionDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoCamionDaoImp.java
new file mode 100644
index 0000000..d352634
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TipoCamionDaoImp.java
@@ -0,0 +1,86 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.TipoCamion;
+import pe.edu.pucp.odiparback.dao.TipoCamionDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class TipoCamionDaoImp implements TipoCamionDao{
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<TipoCamion> getAll() {
+ List<TipoCamion> resultado = null;
+ try{
+ String query = "FROM TipoCamion";
+ resultado = entityManager.createQuery(query).getResultList();
+
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public TipoCamion get(int id) {
+ TipoCamion resultado = null;
+ try {
+ resultado = entityManager.find(TipoCamion.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(TipoCamion tipoCamion) {
+ try {
+ entityManager.merge(tipoCamion);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+ @Transactional
+ @Override
+ public TipoCamion update(TipoCamion tipoCamion) {
+ try {
+ entityManager.merge(tipoCamion);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return tipoCamion;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ TipoCamion resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoDaoImp.java
new file mode 100644
index 0000000..98aa05b
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoDaoImp.java
@@ -0,0 +1,86 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.Tramo;
+import pe.edu.pucp.odiparback.dao.TramoDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class TramoDaoImp implements TramoDao{
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<Tramo> getAll() {
+ List<Tramo> resultado = null;
+ try{
+ String query = "FROM Tramo";
+ resultado = entityManager.createQuery(query).getResultList();
+ //System.out.println(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public Tramo get(int id) {
+ Tramo resultado = null;
+ try {
+ resultado = entityManager.find(Tramo.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(Tramo tramo) {
+ try {
+ entityManager.merge(tramo);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+ @Transactional
+ @Override
+ public Tramo update(Tramo tramo) {
+ try {
+ entityManager.merge(tramo);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return tramo;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ Tramo resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoRutaDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoRutaDaoImp.java
new file mode 100644
index 0000000..92fe337
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/TramoRutaDaoImp.java
@@ -0,0 +1,87 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.TramoRuta;
+import pe.edu.pucp.odiparback.dao.TramoRutaDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class TramoRutaDaoImp implements TramoRutaDao {
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<TramoRuta> getAll() {
+ List<TramoRuta> resultado = null;
+ try{
+ String query = "FROM TramoRuta";
+ resultado = entityManager.createQuery(query).getResultList();
+ // System.out.println(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public TramoRuta get(int id) {
+ TramoRuta resultado = null;
+ try {
+ resultado = entityManager.find(TramoRuta.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(TramoRuta tramoRuta) {
+ try {
+ entityManager.merge(tramoRuta);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ }
+
+ @Transactional
+ @Override
+ public TramoRuta update(TramoRuta tramoRuta) {
+ try {
+ entityManager.merge(tramoRuta);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return tramoRuta;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ TramoRuta resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/UsuarioDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/UsuarioDaoImp.java
new file mode 100644
index 0000000..af2408e
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/UsuarioDaoImp.java
@@ -0,0 +1,86 @@
+package pe.edu.pucp.odiparback.dao.imp;
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import pe.edu.pucp.odiparback.models.Usuario;
+import pe.edu.pucp.odiparback.dao.UsuarioDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class UsuarioDaoImp implements UsuarioDao{
+ @PersistenceContext
+ EntityManager entityManager;
+
+ @Transactional
+ @Override
+ public List<Usuario> getAll() {
+ List<Usuario> resultado = null;
+ try{
+ String query = "FROM Usuario";
+ resultado = entityManager.createQuery(query).getResultList();
+ // System.out.println(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public Usuario get(int id) {
+ Usuario resultado = null;
+ try {
+ resultado = entityManager.find(Usuario.class, id);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+
+ return resultado;
+ }
+
+ @Transactional
+ @Override
+ public void register(Usuario usuario) {
+ try {
+ entityManager.merge(usuario);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+ @Transactional
+ @Override
+ public Usuario update(Usuario usuario) {
+ try {
+ entityManager.merge(usuario);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ return usuario;
+ }
+
+ @Transactional
+ @Override
+ public void delete(int id) {
+ Usuario resultado = get(id);
+ try {
+ entityManager.remove(resultado);
+ }
+ catch(Exception ex){
+ System.out.print(ex.getMessage());
+ }
+ }
+
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/services/aaa.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/services/aaa.java
deleted file mode 100644
index 7898192..0000000
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/demo/services/aaa.java
+++ /dev/null
@@ -1 +0,0 @@
-a
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..121b711 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,28 @@ 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 = "ubigeo")
+ private String ubigeo;
- @Column(name = "posicionX")
- private int posicionX;
+ @Column(name = "departamento")
+ private String departamento;
- @Column(name = "posicionY")
- private int posicionY;
+ @Column(name = "provincia")
+ private String provincia;
+
+ @Column(name = "latitud")
+ private double latitud;
+
+ @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..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
@@ -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 String codigoPedido; // URL
@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=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..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
@@ -33,28 +33,20 @@ 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;
-
- @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
- @JoinColumn(name = "idTramoRuta")
- private List<TramoRuta> tramoRutas;
+ @Column(name = "fechaFin")
+ private Date fechaFin;
@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..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
@@ -21,7 +21,7 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
@Entity
-@Table(name = "tramoRuta")
+@Table(name = "tramo_ruta")
@SQLDelete(sql = "UPDATE tramoRuta SET activo = 0 WHERE id = ?")
@Where(clause = "activo = 1")
@NoArgsConstructor
@@ -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,11 @@ public class TramoRuta {
private Date horaLlegadaReal;
@ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "idTramo")
+ @JoinColumn(name = "tramo_fk")
private Tramo tramo;
+
+ // ruta_fk
+ @ManyToOne(fetch = FetchType.EAGER)
+ @JoinColumn(name = "ruta_fk")
+ private Ruta 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 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;
}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/AlmacenService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/AlmacenService.java
new file mode 100644
index 0000000..9bafcd6
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/AlmacenService.java
@@ -0,0 +1,33 @@
+package pe.edu.pucp.odiparback.services;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.AlmacenDao;
+import pe.edu.pucp.odiparback.models.Almacen;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AlmacenService {
+ @Autowired
+ AlmacenDao daoAlmacen;
+
+ public List<Almacen> getAll(){
+ return daoAlmacen.getAll();
+ }
+
+ public Almacen get(int id){
+ return daoAlmacen.get(id);
+ }
+
+ public void register(Almacen almacen){
+ daoAlmacen.register(almacen);
+ }
+
+ public Almacen update(Almacen almacen){
+ return daoAlmacen.update(almacen);
+ }
+
+ public void delete(int id){
+ daoAlmacen.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/AveriaService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/AveriaService.java
new file mode 100644
index 0000000..656452e
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/AveriaService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.AveriaDao;
+import pe.edu.pucp.odiparback.models.Averia;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AveriaService {
+ @Autowired
+ AveriaDao daoAveria;
+
+ public List<Averia> getAll(){
+ return daoAveria.getAll();
+ }
+
+ public Averia get(int id){
+ return daoAveria.get(id);
+ }
+
+ public void register(Averia averia){
+ daoAveria.register(averia);
+ }
+
+ public Averia update(Averia averia){
+ return daoAveria.update(averia);
+ }
+
+ public void delete(int id){
+ daoAveria.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/CamionService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/CamionService.java
new file mode 100644
index 0000000..eabf02f
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/CamionService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.CamionDao;
+import pe.edu.pucp.odiparback.models.Camion;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CamionService {
+ @Autowired
+ CamionDao daoCamion;
+
+ public List<Camion> getAll(){
+ return daoCamion.getAll();
+ }
+
+ public Camion get(int id){
+ return daoCamion.get(id);
+ }
+
+ public void register(Camion camion){
+ daoCamion.register(camion);
+ }
+
+ public Camion update(Camion camion){
+ return daoCamion.update(camion);
+ }
+
+ public void delete(int id){
+ daoCamion.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/ClienteService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/ClienteService.java
new file mode 100644
index 0000000..2e8eb1b
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/ClienteService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.ClienteDao;
+import pe.edu.pucp.odiparback.models.Cliente;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ClienteService {
+ @Autowired
+ ClienteDao daoCliente;
+
+ public List<Cliente> getAll(){
+ return daoCliente.getAll();
+ }
+
+ public Cliente get(int id){
+ return daoCliente.get(id);
+ }
+
+ public void register(Cliente cliente){
+ daoCliente.register(cliente);
+ }
+
+ public Cliente update(Cliente cliente){
+ return daoCliente.update(cliente);
+ }
+
+ public void delete(int id){
+ daoCliente.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/PTGService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/PTGService.java
new file mode 100644
index 0000000..1c7bfd0
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/PTGService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.PTGDao;
+import pe.edu.pucp.odiparback.models.PTG;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PTGService {
+ @Autowired
+ PTGDao daoPTG;
+
+ public List<PTG> getAll(){
+ return daoPTG.getAll();
+ }
+
+ public PTG get(int id){
+ return daoPTG.get(id);
+ }
+
+ public void register(PTG planTransporte){
+ daoPTG.register(planTransporte);
+ }
+
+ public PTG update(PTG planTransporte){
+ return daoPTG.update(planTransporte);
+ }
+
+ public void delete(int id){
+ daoPTG.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/PedidoService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/PedidoService.java
new file mode 100644
index 0000000..e0ca661
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/PedidoService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.PedidoDao;
+import pe.edu.pucp.odiparback.models.Pedido;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class PedidoService {
+ @Autowired
+ PedidoDao daoPedido;
+
+ public List<Pedido> getAll(){
+ return daoPedido.getAll();
+ }
+
+ public Pedido get(int id){
+ return daoPedido.get(id);
+ }
+
+ public void register(Pedido pedido){
+ daoPedido.register(pedido);
+ }
+
+ public Pedido update(Pedido pedido){
+ return daoPedido.update(pedido);
+ }
+
+ public void delete(int id){
+ daoPedido.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RegionService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RegionService.java
new file mode 100644
index 0000000..3f0f226
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RegionService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.RegionDao;
+import pe.edu.pucp.odiparback.models.Region;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RegionService {
+ @Autowired
+ RegionDao daoRegion;
+
+ public List<Region> getAll(){
+ return daoRegion.getAll();
+ }
+
+ public Region get(int id){
+ return daoRegion.get(id);
+ }
+
+ public void register(Region region){
+ daoRegion.register(region);
+ }
+
+ public Region update(Region region){
+ return daoRegion.update(region);
+ }
+
+ public void delete(int id){
+ daoRegion.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RutaService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RutaService.java
new file mode 100644
index 0000000..0055ae8
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RutaService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.RutaDao;
+import pe.edu.pucp.odiparback.models.Ruta;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RutaService {
+ @Autowired
+ RutaDao daoRuta;
+
+ public List<Ruta> getAll(){
+ return daoRuta.getAll();
+ }
+
+ public Ruta get(int id){
+ return daoRuta.get(id);
+ }
+
+ public void register(Ruta ruta){
+ daoRuta.register(ruta);
+ }
+
+ public Ruta update(Ruta ruta){
+ return daoRuta.update(ruta);
+ }
+
+ public void delete(int id){
+ daoRuta.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TipoAveriaService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TipoAveriaService.java
new file mode 100644
index 0000000..6cb7719
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TipoAveriaService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.TipoAveriaDao;
+import pe.edu.pucp.odiparback.models.TipoAveria;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TipoAveriaService {
+ @Autowired
+ TipoAveriaDao daoTipoAveria;
+
+ public List<TipoAveria> getAll(){
+ return daoTipoAveria.getAll();
+ }
+
+ public TipoAveria get(int id){
+ return daoTipoAveria.get(id);
+ }
+
+ public void register(TipoAveria tipoAveria){
+ daoTipoAveria.register(tipoAveria);
+ }
+
+ public TipoAveria update(TipoAveria tipoAveria){
+ return daoTipoAveria.update(tipoAveria);
+ }
+
+ public void delete(int id){
+ daoTipoAveria.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TipoCamionService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TipoCamionService.java
new file mode 100644
index 0000000..fd7b811
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TipoCamionService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.TipoCamionDao;
+import pe.edu.pucp.odiparback.models.TipoCamion;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TipoCamionService {
+ @Autowired
+ TipoCamionDao daoTipoCamion;
+
+ public List<TipoCamion> getAll(){
+ return daoTipoCamion.getAll();
+ }
+
+ public TipoCamion get(int id){
+ return daoTipoCamion.get(id);
+ }
+
+ public void register(TipoCamion tipoCamion){
+ daoTipoCamion.register(tipoCamion);
+ }
+
+ public TipoCamion update(TipoCamion tipoCamion){
+ return daoTipoCamion.update(tipoCamion);
+ }
+
+ public void delete(int id){
+ daoTipoCamion.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TramoRutaService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TramoRutaService.java
new file mode 100644
index 0000000..2348992
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TramoRutaService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.TramoRutaDao;
+import pe.edu.pucp.odiparback.models.TramoRuta;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TramoRutaService {
+ @Autowired
+ TramoRutaDao daoTramoRuta;
+
+ public List<TramoRuta> getAll(){
+ return daoTramoRuta.getAll();
+ }
+
+ public TramoRuta get(int id){
+ return daoTramoRuta.get(id);
+ }
+
+ public void register(TramoRuta tramoRuta){
+ daoTramoRuta.register(tramoRuta);
+ }
+
+ public TramoRuta update(TramoRuta tramoRuta){
+ return daoTramoRuta.update(tramoRuta);
+ }
+
+ public void delete(int id){
+ daoTramoRuta.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TramoService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TramoService.java
new file mode 100644
index 0000000..13fc5b2
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/TramoService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.TramoDao;
+import pe.edu.pucp.odiparback.models.Tramo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TramoService {
+ @Autowired
+ TramoDao daoTramo;
+
+ public List<Tramo> getAll(){
+ return daoTramo.getAll();
+ }
+
+ public Tramo get(int id){
+ return daoTramo.get(id);
+ }
+
+ public void register(Tramo tramo){
+ daoTramo.register(tramo);
+ }
+
+ public Tramo update(Tramo tramo){
+ return daoTramo.update(tramo);
+ }
+
+ public void delete(int id){
+ daoTramo.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/UsuarioService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/UsuarioService.java
new file mode 100644
index 0000000..c7215ad
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/UsuarioService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.UsuarioDao;
+import pe.edu.pucp.odiparback.models.Usuario;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UsuarioService {
+ @Autowired
+ UsuarioDao daoUsuario;
+
+ public List<Usuario> getAll(){
+ return daoUsuario.getAll();
+ }
+
+ public Usuario get(int id){
+ return daoUsuario.get(id);
+ }
+
+ public void register(Usuario usuario){
+ daoUsuario.register(usuario);
+ }
+
+ public Usuario update(Usuario usuario){
+ return daoUsuario.update(usuario);
+ }
+
+ public void delete(int id){
+ daoUsuario.delete(id);
+ }
+}
diff --git a/back/odiparback/src/main/resources/application.properties b/back/odiparback/src/main/resources/application.properties
index 8b13789..5c476bd 100644
--- a/back/odiparback/src/main/resources/application.properties
+++ b/back/odiparback/src/main/resources/application.properties
@@ -1 +1,18 @@
+# MySQL
+spring.datasource.url=jdbc:mysql://tokumori.xyz:3306/odiparback
+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)
+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
diff --git a/back/sql/20220601dump.sampledata.sql b/back/sql/20220601dump.sampledata.sql
new file mode 100644
index 0000000..5042e32
--- /dev/null
+++ b/back/sql/20220601dump.sampledata.sql
@@ -0,0 +1,85 @@
+-- Adminer 4.7.9 MySQL dump
+
+SET NAMES utf8;
+SET time_zone = '+00:00';
+SET foreign_key_checks = 0;
+SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
+
+SET NAMES utf8mb4;
+
+TRUNCATE `almacen`;
+INSERT INTO `almacen` (`id`, `activo`, `ubigeo`, `departamento`, `provincia`, `latitud`, `longitud`, `esPrincipal`, `region_fk`) VALUES
+(1, 1, '10201', 'Amazonas', 'Bagua', -5.63906152, -78.53166353, 0, 3),
+(2, 1, '40101', 'Arequipa', 'Arequipa', -16.39881421, -71.537019649, 1, 1),
+(3, 1, '50901', 'Ayacucho', 'Sucre', -14.01125749, -73.83884087, 0, 2),
+(4, 1, '130101', 'La Libertad', 'Trujillo', -8.11176389, -79.02868652, 1, 1),
+(5, 1, '150101', 'Lima', 'Lima', -12.04591952, -77.03049615, 1, 1),
+(6, 1, '230101', 'Tacna', 'Tacna', -18.0137008, -70.2507964, 0, 1);
+
+TRUNCATE `averia`;
+
+TRUNCATE `camion`;
+INSERT INTO `camion` (`id`, `activo`, `placa`, `kilometraje`, `estado`, `tipoCamion_fk`) VALUES
+(1, 1, 'ETALLIC', 69420, 1, 1);
+
+TRUNCATE `cliente`;
+INSERT INTO `cliente` (`id`, `activo`, `nombreCompleto`, `dni`, `correo`, `telefono`) VALUES
+(1, 1, 'EmpresaAAA', '1234567890', '[email protected]', '123456789'),
+(2, 1, 'EmpresaBBB', '1234567890', '[email protected]', '123456789');
+
+TRUNCATE `pedido`;
+INSERT INTO `pedido` (`id`, `activo`, `fechaPedido`, `cantidad`, `plazoEntrega`, `estado`, `codigoPedido`, `almacen_fk`, `cliente_fk`, `usuario_fk`, `PTG_fk`) VALUES
+(2, 1, '2022-01-01 00:00:00', 10, 1, 0, '20220101_000001', 3, 1, 4, NULL);
+
+TRUNCATE `PTG`;
+INSERT INTO `PTG` (`id`, `activo`, `fechaGenerado`, `esSimulacion`, `usuario_fk`) VALUES
+(1, 1, '2022-06-01 05:10:47', 1, 1);
+
+TRUNCATE `region`;
+INSERT INTO `region` (`id`, `activo`, `nombre`) VALUES
+(1, 1, 'costa'),
+(2, 1, 'sierra'),
+(3, 1, 'selva');
+
+TRUNCATE `rol`;
+INSERT INTO `rol` (`id`, `activo`, `nombre`) VALUES
+(1, 1, 'superuser');
+
+TRUNCATE `ruta`;
+INSERT INTO `ruta` (`id`, `activo`, `fechaInicio`, `fechaFin`, `PTG_fk`, `camion_fk`) VALUES
+(1, 1, '2022-01-01 00:00:00', '2022-01-02 00:00:00', 1, 1);
+
+TRUNCATE `tipoAveria`;
+
+TRUNCATE `tipoCamion`;
+INSERT INTO `tipoCamion` (`id`, `activo`, `nombre`, `capacidad`) VALUES
+(1, 1, 'tipoA', 90),
+(2, 1, 'tipoB', 45),
+(3, 1, 'tipoC', 30);
+
+TRUNCATE `tramo`;
+INSERT INTO `tramo` (`id`, `activo`, `distancia`, `estaBloqueado`, `almacen1_fk`, `almacen2_fk`) VALUES
+(1, 1, 10, 0, 2, 5),
+(2, 1, 10, 0, 3, 5),
+(3, 1, 10, 0, 4, 5),
+(4, 1, 10, 0, 6, 5),
+(5, 1, 20, 0, 1, 4),
+(6, 1, 20, 0, 4, 1),
+(7, 1, 10, 0, 5, 2),
+(8, 1, 10, 0, 5, 3),
+(9, 1, 10, 0, 5, 4),
+(10, 1, 10, 0, 5, 6);
+
+TRUNCATE `tramo_ruta`;
+INSERT INTO `tramo_ruta` (`id`, `activo`, `orden`, `horaSalidaEst`, `horaLlegadaEst`, `horaSalidaReal`, `horaLlegadaReal`, `paquetesEntregar`, `ruta_fk`, `tramo_fk`) VALUES
+(1, 1, 1, '2022-01-01 10:00:00', '2022-01-01 15:00:00', NULL, NULL, 0, 1, 9),
+(2, 1, 2, '2022-01-01 16:00:00', '2022-01-01 21:00:00', NULL, NULL, 10, 1, 6);
+
+TRUNCATE `usuario`;
+INSERT INTO `usuario` (`id`, `activo`, `usuario`, `clave`, `nombre`, `apellido`, `dni`, `correo`, `creador_fk`, `rol_fk`) VALUES
+(1, 1, 'gabs', '*6AB7931FB2D104A478932D23AF4C7700D1A0C61A', 'Gabriela', 'Hernandez', '12345678', '[email protected]', NULL, 1),
+(2, 1, 'dayana', '*D279131EA232308E083B3EA192B78A0C15EA8701', 'Dayana', 'Alarcon', '12345678', '[email protected]', 1, 1),
+(3, 1, 'jannina', '*D279131EA232308E083B3EA192B84A0C15EA8701', 'Jannina', 'DeLosGodos', '12345678', '[email protected]', 1, 1),
+(4, 1, 'mitsuo', '*D279131EA232308E083B3EA192B74A0C15EA8701', 'Mitsuo', 'Tokumori', '12345678', '[email protected]', 1, 1);
+
+-- 2022-06-01 06:13:09
diff --git a/back/sql/20220601dump.tables+views.sql b/back/sql/20220601dump.tables+views.sql
new file mode 100644
index 0000000..7ff1c24
--- /dev/null
+++ b/back/sql/20220601dump.tables+views.sql
@@ -0,0 +1,245 @@
+-- Adminer 4.7.9 MySQL dump
+
+SET NAMES utf8;
+SET time_zone = '+00:00';
+SET foreign_key_checks = 0;
+SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
+
+SET NAMES utf8mb4;
+
+DROP TABLE IF EXISTS `almacen`;
+CREATE TABLE `almacen` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `ubigeo` varchar(10) NOT NULL,
+ `departamento` varchar(100) NOT NULL,
+ `provincia` varchar(100) NOT NULL,
+ `latitud` double NOT NULL,
+ `longitud` double NOT NULL,
+ `esPrincipal` int(11) NOT NULL,
+ `region_fk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `region_fk` (`region_fk`),
+ CONSTRAINT `almacen_ibfk_1` FOREIGN KEY (`region_fk`) REFERENCES `region` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `averia`;
+CREATE TABLE `averia` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `descripcion` varchar(1000) NOT NULL,
+ `fechaRegistro` datetime NOT NULL,
+ `camion_fk` int(11) NOT NULL,
+ `tipoAveria_fk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `camion_fk` (`camion_fk`),
+ KEY `tipoAveria_fk` (`tipoAveria_fk`),
+ CONSTRAINT `averia_ibfk_1` FOREIGN KEY (`camion_fk`) REFERENCES `camion` (`id`),
+ CONSTRAINT `averia_ibfk_2` FOREIGN KEY (`tipoAveria_fk`) REFERENCES `tipoAveria` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `camion`;
+CREATE TABLE `camion` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `placa` varchar(10) NOT NULL,
+ `kilometraje` double NOT NULL,
+ `estado` int(11) NOT NULL,
+ `tipoCamion_fk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `tipoCamion_fk` (`tipoCamion_fk`),
+ CONSTRAINT `camion_ibfk_1` FOREIGN KEY (`tipoCamion_fk`) REFERENCES `tipoCamion` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `cliente`;
+CREATE TABLE `cliente` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `nombreCompleto` varchar(100) NOT NULL,
+ `dni` varchar(10) NOT NULL,
+ `correo` varchar(100) NOT NULL,
+ `telefono` varchar(20) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `pedido`;
+CREATE TABLE `pedido` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `fechaPedido` datetime NOT NULL,
+ `cantidad` int(11) NOT NULL,
+ `plazoEntrega` int(11) NOT NULL,
+ `estado` int(11) NOT NULL,
+ `codigoPedido` varchar(100) DEFAULT NULL,
+ `almacen_fk` int(11) NOT NULL,
+ `cliente_fk` int(11) NOT NULL,
+ `usuario_fk` int(11) NOT NULL,
+ `PTG_fk` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `usuario_fk` (`usuario_fk`),
+ KEY `PTG_fk` (`PTG_fk`),
+ KEY `cliente_fk` (`cliente_fk`),
+ KEY `almacen_fk` (`almacen_fk`),
+ CONSTRAINT `pedido_ibfk_1` FOREIGN KEY (`usuario_fk`) REFERENCES `usuario` (`id`),
+ CONSTRAINT `pedido_ibfk_2` FOREIGN KEY (`PTG_fk`) REFERENCES `PTG` (`id`),
+ CONSTRAINT `pedido_ibfk_3` FOREIGN KEY (`cliente_fk`) REFERENCES `cliente` (`id`),
+ CONSTRAINT `pedido_ibfk_4` FOREIGN KEY (`almacen_fk`) REFERENCES `almacen` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `PTG`;
+CREATE TABLE `PTG` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `fechaGenerado` datetime NOT NULL,
+ `esSimulacion` int(11) NOT NULL,
+ `usuario_fk` int(11) DEFAULT NULL,
+ PRIMARY KEY (`id`),
+ KEY `usuario_fk` (`usuario_fk`),
+ CONSTRAINT `PTG_ibfk_1` FOREIGN KEY (`usuario_fk`) REFERENCES `usuario` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `region`;
+CREATE TABLE `region` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `nombre` varchar(100) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `rol`;
+CREATE TABLE `rol` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `nombre` varchar(100) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `ruta`;
+CREATE TABLE `ruta` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `fechaInicio` datetime NOT NULL,
+ `fechaFin` datetime NOT NULL,
+ `PTG_fk` int(11) NOT NULL,
+ `camion_fk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `PTG_fk` (`PTG_fk`),
+ KEY `camion_fk` (`camion_fk`),
+ CONSTRAINT `ruta_ibfk_1` FOREIGN KEY (`PTG_fk`) REFERENCES `PTG` (`id`),
+ CONSTRAINT `ruta_ibfk_2` FOREIGN KEY (`camion_fk`) REFERENCES `camion` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `tipoAveria`;
+CREATE TABLE `tipoAveria` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `nombre` int(11) NOT NULL,
+ `duracion` int(11) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `tipoCamion`;
+CREATE TABLE `tipoCamion` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `nombre` varchar(100) NOT NULL,
+ `capacidad` int(11) NOT NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `tramo`;
+CREATE TABLE `tramo` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `distancia` double NOT NULL,
+ `estaBloqueado` int(11) NOT NULL,
+ `almacen1_fk` int(11) NOT NULL,
+ `almacen2_fk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `almacen1_fk` (`almacen1_fk`),
+ KEY `almacen2_fk` (`almacen2_fk`),
+ CONSTRAINT `tramo_ibfk_1` FOREIGN KEY (`almacen1_fk`) REFERENCES `almacen` (`id`),
+ CONSTRAINT `tramo_ibfk_2` FOREIGN KEY (`almacen2_fk`) REFERENCES `almacen` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `tramo_ruta`;
+CREATE TABLE `tramo_ruta` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `orden` int(11) NOT NULL,
+ `horaSalidaEst` datetime NOT NULL,
+ `horaLlegadaEst` datetime NOT NULL,
+ `horaSalidaReal` datetime DEFAULT NULL,
+ `horaLlegadaReal` datetime DEFAULT NULL,
+ `paquetesEntregar` int(11) NOT NULL,
+ `ruta_fk` int(11) NOT NULL,
+ `tramo_fk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `ruta_fk` (`ruta_fk`),
+ KEY `tramo_fk` (`tramo_fk`),
+ CONSTRAINT `tramo_ruta_ibfk_1` FOREIGN KEY (`ruta_fk`) REFERENCES `ruta` (`id`),
+ CONSTRAINT `tramo_ruta_ibfk_2` FOREIGN KEY (`tramo_fk`) REFERENCES `tramo` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP TABLE IF EXISTS `usuario`;
+CREATE TABLE `usuario` (
+ `id` int(11) NOT NULL AUTO_INCREMENT,
+ `activo` int(11) NOT NULL,
+ `usuario` varchar(100) NOT NULL,
+ `clave` varchar(100) NOT NULL,
+ `nombre` varchar(100) NOT NULL,
+ `apellido` varchar(100) NOT NULL,
+ `dni` varchar(10) NOT NULL,
+ `correo` varchar(100) NOT NULL,
+ `creador_fk` int(11) DEFAULT NULL,
+ `rol_fk` int(11) NOT NULL,
+ PRIMARY KEY (`id`),
+ KEY `creador_fk` (`creador_fk`),
+ KEY `rol_fk` (`rol_fk`),
+ CONSTRAINT `usuario_ibfk_2` FOREIGN KEY (`creador_fk`) REFERENCES `usuario` (`id`),
+ CONSTRAINT `usuario_ibfk_3` FOREIGN KEY (`rol_fk`) REFERENCES `usuario` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+
+
+DROP VIEW IF EXISTS `v_almacen`;
+CREATE TABLE `v_almacen` (`ubigeo` varchar(10), `departamento` varchar(100), `provincia` varchar(100), `latitud` double, `longitud` double, `esPrincipal` int(11), `region` varchar(100));
+
+
+DROP VIEW IF EXISTS `v_camion`;
+CREATE TABLE `v_camion` (`id` int(11), `placa` varchar(10), `kilometraje` double, `estado` int(11), `tipo` varchar(100), `capacidad` int(11));
+
+
+DROP VIEW IF EXISTS `v_pedido`;
+CREATE TABLE `v_pedido` (`cliente` varchar(100), `RUC` varchar(10), `ubigeo` varchar(10), `provincia` varchar(100), `cantidad` int(11), `fechaPedido` datetime, `plazoEntrega` int(11), `estado` int(11), `URL_pedido` varchar(100), `registrado por` varchar(100));
+
+
+DROP VIEW IF EXISTS `v_usuario`;
+CREATE TABLE `v_usuario` (`usuario` varchar(100), `nombre` varchar(100), `apellido` varchar(100), `dni` varchar(10), `correo` varchar(100), `registered by` varchar(100), `rol` varchar(100));
+
+
+DROP TABLE IF EXISTS `v_almacen`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`gabs`@`%.%.%.%` SQL SECURITY DEFINER VIEW `v_almacen` AS select `a`.`ubigeo` AS `ubigeo`,`a`.`departamento` AS `departamento`,`a`.`provincia` AS `provincia`,`a`.`latitud` AS `latitud`,`a`.`longitud` AS `longitud`,`a`.`esPrincipal` AS `esPrincipal`,`r`.`nombre` AS `region` from (`almacen` `a` join `region` `r` on(`a`.`region_fk` = `r`.`id`)) where a.activo = 1;
+
+DROP TABLE IF EXISTS `v_camion`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`gabs`@`%.%.%.%` SQL SECURITY DEFINER VIEW `v_camion` AS select `c`.`id` AS `id`,`c`.`placa` AS `placa`,`c`.`kilometraje` AS `kilometraje`,`c`.`estado` AS `estado`,`tc`.`nombre` AS `tipo`,`tc`.`capacidad` AS `capacidad` from (`camion` `c` join `tipoCamion` `tc` on(`c`.`tipoCamion_fk` = `tc`.`id`)) where c.activo = 1;
+
+DROP TABLE IF EXISTS `v_pedido`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`gabs`@`%.%.%.%` SQL SECURITY DEFINER VIEW `v_pedido` AS select `cli`.`nombreCompleto` AS `cliente`,`cli`.`dni` AS `RUC`,`alm`.`ubigeo` AS `ubigeo`,`alm`.`provincia` AS `provincia`,`ped`.`cantidad` AS `cantidad`,`ped`.`fechaPedido` AS `fechaPedido`,`ped`.`plazoEntrega` AS `plazoEntrega`,`ped`.`estado` AS `estado`,`ped`.`codigoPedido` AS `URL_pedido`,`usu`.`usuario` AS `registrado por` from (((`pedido` `ped` join `cliente` `cli` on(`ped`.`cliente_fk` = `cli`.`id`)) join `usuario` `usu` on(`ped`.`usuario_fk` = `usu`.`id`)) join `almacen` `alm` on(`ped`.`almacen_fk` = `alm`.`id`)) where ped.activo = 1;
+
+DROP TABLE IF EXISTS `v_usuario`;
+CREATE ALGORITHM=UNDEFINED DEFINER=`gabs`@`%.%.%.%` SQL SECURITY DEFINER VIEW `v_usuario` AS select `u`.`usuario` AS `usuario`,`u`.`nombre` AS `nombre`,`u`.`apellido` AS `apellido`,`u`.`dni` AS `dni`,`u`.`correo` AS `correo`,`u2`.`nombre` AS `registered by`,`r`.`nombre` AS `rol` from ((`usuario` `u` left join `usuario` `u2` on(`u`.`creador_fk` = `u2`.`id`)) join `rol` `r` on(`u`.`rol_fk` = `r`.`id`)) where u.activo = 1;
+
+-- 2022-06-01 06:30:20
diff --git a/back/sql/some_views_and_selects.sql b/back/sql/some_views_and_selects.sql
new file mode 100644
index 0000000..e5306e3
--- /dev/null
+++ b/back/sql/some_views_and_selects.sql
@@ -0,0 +1,47 @@
+-- v_almacen
+select a.ubigeo, a.departamento, a.provincia, a.latitud, a.longitud,
+ a.esPrincipal, r.nombre AS region
+ from almacen a join region r on a.region_fk = r.id;
+
+-- v_camion
+select c.id, c.placa, c.kilometraje, c.estado,
+ tc.nombre AS 'tipo', tc.capacidad
+ from camion c join tipoCamion tc on c.tipoCamion_fk = tc.id;
+
+-- v_pedido
+select cli.nombreCompleto AS cliente, cli.dni AS RUC,
+ alm.ubigeo, alm.provincia,
+ ped.cantidad, ped.fechaPedido, ped.plazoEntrega, ped.estado,
+ ped.codigoPedido AS URL_pedido,
+ usu.usuario AS 'registrado por'
+ from pedido ped join cliente cli on ped.cliente_fk = cli.id
+ inner join usuario usu on ped.usuario_fk = usu.id
+ inner join almacen alm on ped.almacen_fk = alm.id;
+
+-- v_tramo
+select t.id as 'tramo', t.distancia, t.estaBloqueado,
+ a1.id, a1.provincia, a2.id, a2.provincia
+ from tramo t inner join almacen a1 on t.almacen1_fk = a1.id
+ inner join almacen a2 on t.almacen2_fk = a2.id
+ order by a1.id;
+
+-- v_usuario
+select u.usuario, u.nombre, u.apellido, u.dni, u.correo,
+ u2.nombre AS 'registered by', r.nombre AS rol
+ from usuario u left join usuario u2 on u.creador_fk = u2.id
+ inner join rol r on u.rol_fk = r.id;
+
+-- PTG (lista de rutas)
+
+-- "Select de ruta": Listado de tramos de la ruta con id=1
+select t_r.orden, r.fechaInicio, r.fechaFin,
+ a1.provincia, a2.provincia, t.distancia,
+ c.placa, t_r.paquetesEntregar
+ from ruta r inner join tramo_ruta t_r on r.id = t_r.ruta_fk
+ inner join tramo t on t.id = t_r.ruta_fk
+ inner join almacen a1 on t.almacen1_fk = a1.id
+ inner join almacen a2 on t.almacen2_fk = a2.id
+
+ inner join camion c on r.camion_fk = c.id
+ where r.id = 1
+ order by t_r.orden;
diff --git a/back/sql/ss_20220531_221843.png b/back/sql/ss_20220531_221843.png
new file mode 100644
index 0000000..fbec2c2
--- /dev/null
+++ b/back/sql/ss_20220531_221843.png
Binary files differ