Implementación Rol y correcciones

19 files changed, 206 insertions, 23 deletions

diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RolController.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RolController.java
new file mode 100644
index 0000000..d6ed4b2
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/controllers/RolController.java
@@ -0,0 +1,55 @@
+package pe.edu.pucp.odiparback.controllers;
+
+import pe.edu.pucp.odiparback.models.Rol;
+import pe.edu.pucp.odiparback.services.RolService;
+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("/rol")
+@CrossOrigin
+public class RolController {
+    @Autowired
+    RolService rolService; 
+
+    @GetMapping(value = "/")
+    List<Rol> getAll(){
+        return rolService.getAll();
+    }
+
+    @GetMapping(value = "/{id}")
+    @Cacheable(value = "rol",key = "#id")
+    Rol get(@PathVariable int id)throws AuthenticationException{
+        return rolService.get(id);
+    }
+
+    @PostMapping(value = "/")
+    void register(@RequestBody Rol rol)throws SQLException{
+        rolService.register(rol);
+    }
+
+    @PutMapping(value = "/")
+    Rol update(@RequestBody Rol rol)throws SQLException{
+        return rolService.update(rol);
+    }
+    
+    @DeleteMapping(value = "/{id}")
+    @CacheEvict(value = "rol", allEntries = true)
+    void delete(@PathVariable int id){
+        rolService.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
index 9c37098..1ec2648 100644
--- 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
@@ -30,7 +30,7 @@ public class TramoRutaController {
     }
 
     @GetMapping(value = "/{id}")
-    @Cacheable(value = "tramo",key = "#id")
+    @Cacheable(value = "tramoRuta",key = "#id")
     TramoRuta get(@PathVariable int id)throws AuthenticationException{
         return tramoRutaService.get(id);
     }
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RolDao.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RolDao.java
new file mode 100644
index 0000000..3187199
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/RolDao.java
@@ -0,0 +1,13 @@
+package pe.edu.pucp.odiparback.dao;
+
+import java.util.List;
+import pe.edu.pucp.odiparback.models.Rol;
+
+
+public interface RolDao {
+    public List<Rol> getAll();
+    public Rol get(int id);
+    public void register(Rol region);
+    public Rol update(Rol 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/imp/AlmacenDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
index 52d8486..80a316e 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/AlmacenDaoImp.java
@@ -26,8 +26,6 @@ public class AlmacenDaoImp implements AlmacenDao {
             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()); 
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
index b3090aa..7005741 100644
--- 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
@@ -23,7 +23,7 @@ public class AveriaDaoImp implements AveriaDao{
     public List<Averia> getAll() {
         List<Averia> resultado = null;
         try{
-            String query = "FROM Averia";
+            String query = "FROM Averia order by id";
             resultado =  entityManager.createQuery(query).getResultList();
       
         }
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
index 07831ae..5b7e122 100644
--- 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
@@ -23,7 +23,7 @@ public class ClienteDaoImp implements ClienteDao {
     public List<Cliente> getAll() {
         List<Cliente> resultado = null;
         try{
-            String query = "FROM Cliente";
+            String query = "FROM Cliente order by id";
             resultado =  entityManager.createQuery(query).getResultList();
    
         }
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
index 6614eb4..a699a29 100644
--- 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
@@ -23,9 +23,9 @@ public class PTGDaoImp implements PTGDao{
     public List<PTG> getAll() {
         List<PTG> resultado = null;
         try{
-            String query = "FROM PTG";
+            String query = "FROM PTG order by id";
             resultado =  entityManager.createQuery(query).getResultList();
-         //   System.out.println(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
index 5fef368..7dba3d5 100644
--- a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/PedidoDaoImp.java
@@ -25,7 +25,7 @@ public class PedidoDaoImp implements PedidoDao {
         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()); 
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
index d9e0d08..c758097 100644
--- 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
@@ -23,9 +23,9 @@ public class RegionDaoImp implements RegionDao {
     public List<Region> getAll() {
         List<Region> resultado = null;
         try{
-            String query = "FROM Region";
+            String query = "FROM Region order by id";
             resultado =  entityManager.createQuery(query).getResultList();
-    //        System.out.println(resultado);  
+ 
         }
         catch(Exception ex){ 
             System.out.print(ex.getMessage()); 
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RolDaoImp.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RolDaoImp.java
new file mode 100644
index 0000000..df227e6
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/dao/imp/RolDaoImp.java
@@ -0,0 +1,85 @@
+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.Rol;
+import pe.edu.pucp.odiparback.dao.RolDao;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.transaction.annotation.Transactional;
+
+
+@Transactional
+@Repository
+@SuppressWarnings("unchecked")
+public class RolDaoImp implements RolDao {
+    @PersistenceContext
+    EntityManager entityManager;
+
+    @Transactional
+    @Override
+    public List<Rol> getAll() {
+        List<Rol> resultado = null;
+        try{
+            String query = "FROM Rol order by id";
+            resultado =  entityManager.createQuery(query).getResultList();
+        }
+        catch(Exception ex){ 
+            System.out.print(ex.getMessage()); 
+        }
+        
+        return resultado;
+    }
+
+    @Transactional
+    @Override
+    public Rol get(int id) {
+        Rol resultado = null;
+        try {
+            resultado = entityManager.find(Rol.class, id);
+        }
+        catch(Exception ex){ 
+            System.out.print(ex.getMessage()); 
+        }
+        
+        return resultado;
+    }
+
+    @Transactional
+    @Override
+    public void register(Rol rol) {
+        try {
+            entityManager.merge(rol);
+        }
+        catch(Exception ex){ 
+            System.out.print(ex.getMessage()); 
+        }
+    }
+
+    @Transactional
+    @Override
+    public Rol update(Rol rol) {
+        try {
+            entityManager.merge(rol);
+        }
+        catch(Exception ex){ 
+            System.out.print(ex.getMessage()); 
+        }
+        return rol;
+    }
+
+    @Transactional
+    @Override
+    public void delete(int id) {
+        Rol 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
index 96b7f3b..329a324 100644
--- 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
@@ -23,9 +23,9 @@ public class RutaDaoImp implements RutaDao {
     public List<Ruta> getAll() {
         List<Ruta> resultado = null;
         try{
-            String query = "FROM Ruta";
+            String query = "FROM Ruta order by id";
             resultado =  entityManager.createQuery(query).getResultList();
-      //      System.out.println(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
index 6bab82f..bfd6caa 100644
--- 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
@@ -23,9 +23,9 @@ public class TipoAveriaDaoImp implements TipoAveriaDao{
     public List<TipoAveria> getAll() {
         List<TipoAveria> resultado = null;
         try{
-            String query = "FROM TipoAveria";
+            String query = "FROM TipoAveria order by id";
             resultado =  entityManager.createQuery(query).getResultList();
-       //     System.out.println(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
index d352634..ebf34b3 100644
--- 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
@@ -23,7 +23,7 @@ public class TipoCamionDaoImp implements TipoCamionDao{
     public List<TipoCamion> getAll() {
         List<TipoCamion> resultado = null;
         try{
-            String query = "FROM TipoCamion";
+            String query = "FROM TipoCamion order by id";
             resultado =  entityManager.createQuery(query).getResultList();
            
         }
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
index 98aa05b..546181c 100644
--- 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
@@ -23,9 +23,9 @@ public class TramoDaoImp implements TramoDao{
     public List<Tramo> getAll() {
         List<Tramo> resultado = null;
         try{
-            String query = "FROM Tramo";
+            String query = "FROM Tramo order by id";
             resultado =  entityManager.createQuery(query).getResultList();
-            //System.out.println(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
index 92fe337..c24dbed 100644
--- 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
@@ -23,9 +23,9 @@ public class TramoRutaDaoImp implements TramoRutaDao {
     public List<TramoRuta> getAll() {
         List<TramoRuta> resultado = null;
         try{
-            String query = "FROM TramoRuta";
+            String query = "FROM TramoRuta order by id";
             resultado =  entityManager.createQuery(query).getResultList();
-       //     System.out.println(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
index af2408e..21c5904 100644
--- 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
@@ -23,9 +23,9 @@ public class UsuarioDaoImp implements UsuarioDao{
     public List<Usuario> getAll() {
         List<Usuario> resultado = null;
         try{
-            String query = "FROM Usuario";
+            String query = "FROM Usuario order by id";
             resultado =  entityManager.createQuery(query).getResultList();
-      //      System.out.println(resultado);  
+  
         }
         catch(Exception ex){ 
             System.out.print(ex.getMessage()); 
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 2c8cc89..03f34e1 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
@@ -30,7 +30,7 @@ import lombok.Setter;
 public class Tramo {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "idTramo", updatable = false, nullable = false)
+    @Column(name = "id", updatable = false, nullable = false)
     private int id;
 
     @Column(name = "activo")
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 02b72f6..f222938 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
@@ -23,7 +23,7 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 @Entity
-@Table(name = "tramo_ruta")
+@Table(name = "tramoRuta")
 @SQLDelete(sql = "UPDATE tramoRuta SET activo = 0 WHERE id = ?")
 @Where(clause = "activo = 1")
 @NoArgsConstructor
diff --git a/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RolService.java b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RolService.java
new file mode 100644
index 0000000..29be7d6
--- /dev/null
+++ b/back/odiparback/src/main/java/pe/edu/pucp/odiparback/services/RolService.java
@@ -0,0 +1,32 @@
+package pe.edu.pucp.odiparback.services;
+import java.util.List;
+import pe.edu.pucp.odiparback.dao.RolDao;
+import pe.edu.pucp.odiparback.models.Rol;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class RolService {
+    @Autowired
+    RolDao daoRol;
+
+    public List<Rol> getAll(){
+        return daoRol.getAll();
+    }
+
+    public Rol get(int id){
+        return daoRol.get(id);
+    }
+
+    public void register(Rol rol){
+        daoRol.register(rol);
+    }
+
+    public Rol update(Rol rol){
+        return daoRol.update(rol);
+    }
+
+    public void delete(int id){
+        daoRol.delete(id);
+    }    
+}