version 0.7

Author: basiliok

src/main/java/com/cibertec/shoesformen_api/MySQLConfig.java

@@ -6,7 +6,6 @@
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Primary;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.orm.jpa.JpaTransactionManager;
 import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;

src/main/java/com/cibertec/shoesformen_api/PostgreSQLConfig.java

@@ -1,12 +1,9 @@
 package com.cibertec.shoesformen_api;
 
-import jakarta.persistence.EntityManagerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.jdbc.DataSourceBuilder;
 import org.springframework.boot.orm.jpa.EntityManagerFactoryBuilder; // <------------------------
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/cibertec/shoesformen_api/a_empresa/EmpresaRepository.java

@@ -1,6 +1,6 @@
 package com.cibertec.shoesformen_api.a_empresa;
 
-import com.cibertec.shoesformen_api.a_empresa.Empresa;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 

src/main/java/com/cibertec/shoesformen_api/controller/EmpleadoController.java

@@ -1,6 +1,5 @@
 package com.cibertec.shoesformen_api.controller;
 
-import com.cibertec.shoesformen_api.exception.EmpleadoNotFoundException;
 import com.cibertec.shoesformen_api.exception.EntidadNotFoundException;
 import com.cibertec.shoesformen_api.exception.ListEmptyException;
 import com.cibertec.shoesformen_api.model.Empleado;
@@ -13,6 +12,7 @@
 import jakarta.validation.Valid;
 import net.sf.jasperreports.engine.JRException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.io.Resource;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -74,14 +74,15 @@ public ResponseEntity delete(@PathVariable String id) throws IllegalArgumentExce
         }
     }
 
-    @GetMapping("/rpt_EXCEL")
-    private ResponseEntity<Void> reporteEmpleadoEXCEL(HttpServletResponse response) throws JRException, IOException {
+    @GetMapping(value = "/rpt_EXCEL", produces = MediaType.MULTIPART_FORM_DATA_VALUE)
+    private ResponseEntity<Resource> reporteEmpleadoEXCEL(HttpServletResponse response) throws JRException, IOException {
         empleadoServ.exportarReporte("excel", response);
         return ResponseEntity.ok().build();
     }
 
     @GetMapping(value = "/rpt_PDF", produces = MediaType.APPLICATION_PDF_VALUE)
     private ResponseEntity<Void> reporteEmpleadoPDF(HttpServletResponse response) throws JRException,IOException{
+        response.setHeader("","");
         empleadoServ.exportarReporte("pdf", response);
         return ResponseEntity.ok().build();
     }

src/main/java/com/cibertec/shoesformen_api/exception/ApplicationExceptionHandler.java

@@ -1,12 +1,10 @@
 package com.cibertec.shoesformen_api.exception;
 
-import org.postgresql.util.PSQLException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.ResponseStatus;
-import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
 import java.sql.SQLException;

src/main/java/com/cibertec/shoesformen_api/model/dto/EmpleadoDTO.java

@@ -7,7 +7,6 @@
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
-import java.util.Collection;
 
 @Data
 @AllArgsConstructor()

src/main/java/com/cibertec/shoesformen_api/repository/EmpleadoRepository.java

@@ -1,7 +1,6 @@
 package com.cibertec.shoesformen_api.repository;
 
 import com.cibertec.shoesformen_api.model.Empleado;
-import com.cibertec.shoesformen_api.model.dto.EmpleadoDTO;
 import com.cibertec.shoesformen_api.model.pojo.EmpleadoPOJO;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
@@ -31,7 +30,7 @@ public interface EmpleadoRepository extends JpaRepository<Empleado, String> {
 
     // CONSULTA NATIVA
     @Query(value="SELECT CONCAT('EM',CAST(SUBSTRING(MAX(e.cod_empleado),3) AS INT) + 1)  FROM empleado AS e", nativeQuery = true)
-    public abstract String getUltimoCodigo();
+    public abstract String getNuevoCodigo();
 
     // Automatico
     public abstract Empleado findByUsuario(String usuario);

src/main/java/com/cibertec/shoesformen_api/service/EmpleadoService.java

@@ -1,15 +1,12 @@
 package com.cibertec.shoesformen_api.service;
 
-import com.cibertec.shoesformen_api.exception.EmpleadoNotFoundException;
 import com.cibertec.shoesformen_api.exception.EntidadNotFoundException;
 import com.cibertec.shoesformen_api.exception.ListEmptyException;
 import com.cibertec.shoesformen_api.model.Empleado;
 import com.cibertec.shoesformen_api.model.dto.EmpleadoDTO;
 import jakarta.servlet.http.HttpServletResponse;
 import net.sf.jasperreports.engine.JRException;
-import org.springframework.http.ResponseEntity;
 
-import javax.management.JMRuntimeException;
 import java.io.IOException;
 import java.util.List;
 import java.util.Optional;

src/main/java/com/cibertec/shoesformen_api/service/EmpleadoServiceImpl.java

@@ -1,5 +1,7 @@
 package com.cibertec.shoesformen_api.service;
 
+import com.cibertec.shoesformen_api.a_empresa.Empresa;
+import com.cibertec.shoesformen_api.a_empresa.EmpresaRepository;
 import com.cibertec.shoesformen_api.exception.EntidadNotFoundException;
 import com.cibertec.shoesformen_api.exception.ListEmptyException;
 import com.cibertec.shoesformen_api.model.Distrito;
@@ -22,7 +24,6 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
 
-import javax.management.JMRuntimeException;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
@@ -39,6 +40,8 @@ public class EmpleadoServiceImpl implements EmpleadoService{
     private EstadoRepository estadoRepo;
     @Autowired
     private RolRepository rolRepo;
+    @Autowired
+    private EmpresaRepository empresaRepo;
 
 
     @Override
@@ -67,7 +70,7 @@ public Optional<Empleado> getEmpleadoByCodigo(String codigo) throws EntidadNotFo
 
     @Override
     public String createNewCodigo() {
-        String codigo_ultimo = empleadoRepo.getUltimoCodigo();
+        String codigo_ultimo = empleadoRepo.getNuevoCodigo();
         String codigo_nuevo = "EM10001";
         if(codigo_ultimo != null){
             return codigo_ultimo;
@@ -118,14 +121,16 @@ public void exportarReporte(String tipo, HttpServletResponse response) throws JR
         String fecha1 = formato1.format(fecha);
         String fecha2 = formato2.format(fecha);
 
-        String imagen = "logo_reporte_2.png";
-        parametros.put("imagen_logo","src/main/resources/static/img/" + imagen);
-        parametros.put("nombre_empresa","SHOES FOR MEN");
+        Empresa empresa = empresaRepo.findById("EP1").orElseThrow(() -> new EntidadNotFoundException("EP1"));
+        //String imagen = "logo_reporte_01.png";
+        //parametros.put("imagen_logo","src/main/resources/static/img/" + imagen);
+        parametros.put("imagen_logo",empresa.getImagen());
+        parametros.put("nombre_empresa",empresa.getNombre().toUpperCase());
         parametros.put("direccion_empresa","AV. URUGUAY N 000 ");
         parametros.put("distrito_empresa","SAN ISIDRO");
         parametros.put("nombre_empleado","KEVIN B");
-        parametros.put("ruc_empresa","55555555555");
-        parametros.put("telefono_empresa","777-7777");
+        parametros.put("ruc_empresa",empresa.getRuc());
+        parametros.put("telefono_empresa",empresa.getTelefono());
         parametros.put("fecha_generacion", fecha1);
         parametros.put("DataEmpleado", dataSource);
 
@@ -144,9 +149,9 @@ public void exportarReporte(String tipo, HttpServletResponse response) throws JR
         else if(tipo.equalsIgnoreCase("excel")) {
             JRXlsxExporter exporter = new JRXlsxExporter(); // la configuracion se hace en el mismo JASPER STUDIO
             exporter.setExporterInput(new SimpleExporterInput(jasperPrint)); //
-            response.setContentType("application/octet-stream");
             exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(response.getOutputStream()));
-            response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=listaEmpleado_" + fecha2 + ".xlsx");
+            response.setContentType("application/vnd.ms-excel");
+            response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=listaEmpleado_" + fecha2 + ".xlsx");
             exporter.exportReport();
         }