Se agregan base de servicios, log4j, conexion a la base de datos, archivos properties

nb-configuration.xml

@@ -15,5 +15,6 @@ Any value defined here will override the pom.xml file value but is only applicab
 -->
         <org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>gfv4ee7</org-netbeans-modules-maven-j2ee.netbeans_2e_hint_2e_deploy_2e_server>
         <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
+        <org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>ide</org-netbeans-modules-maven-jaxws.rest_2e_config_2e_type>
     </properties>
 </project-shared-configuration>

pom.xml

@@ -20,6 +20,12 @@
 
     <dependencies>
         <!-- Java EE API for GlassFish -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.17.1</version>
+            <type>jar</type>
+        </dependency>
         <dependency>
             <groupId>javax</groupId>
             <artifactId>javaee-api</artifactId>
@@ -47,6 +53,22 @@
             <artifactId>quartz</artifactId>
             <version>2.3.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.23.1</version>
+        </dependency>
+        <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.23.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.34</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

src/main/java/amx/ccie/dto/CatalogoDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class CatalogoDTO {
+    
+    private int id;
+    private String nombre;
+    
+    @Override
+    public String toString() {
+        return "Device{id=" + id + ", nombre='" + nombre + "'}";
+    }
+    
+}

src/main/java/amx/ccie/dto/CiudadDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class CiudadDTO {
+    
+    private Long id;
+    private String nombre;
+    private String nombreIngles;
+    
+}

src/main/java/amx/ccie/dto/ClavesDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class ClavesDTO {
+    private String sistema;
+    private String pantalla;
+    private String tipoRegion;
+    private int orden;
+    private String clave;
+}

src/main/java/amx/ccie/dto/CoberturaDestinoResponseDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class CoberturaDestinoResponseDTO {
+    
+    private List<RoamingCoberturaDTO> data;
+    private Boolean success;
+    
+}

src/main/java/amx/ccie/dto/ConceptoRoamingPaqueteDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.math.BigDecimal;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class ConceptoRoamingPaqueteDTO {
+    
+    private Long idPaquete;
+    private Long idOpcion;
+    private String valor;
+    private String ahorro;
+    private String nombre;
+    private String leyenda;
+    private BigDecimal orden;
+    private BigDecimal etiqueta;
+    private String leyenda2;
+    private String leyenda3;
+    private String link;
+    
+}

src/main/java/amx/ccie/dto/EquipoResponseDTO.java

+package amx.ccie.dto;
+
+/**
+ *
+ * @author montielj
+ */
+import java.util.List;
+import lombok.Data;
+
+@Data
+public class EquipoResponseDTO {
+
+    private List<CatalogoDTO> data;
+
+    private String success;
+
+    @Override
+    public String toString() {
+        return "DeviceResponse{data=" + data + ", success='" + success + "'}";
+    }
+}
+

src/main/java/amx/ccie/dto/EquipoTecnologiaBandaDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class EquipoTecnologiaBandaDTO {
+    
+    private String banda;
+    
+}

src/main/java/amx/ccie/dto/EquipoTecnologiaDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class EquipoTecnologiaDTO {
+    
+    private Long idTecnologia;
+    private String tecnologia;
+    private List<EquipoTecnologiaFrecuenciaDTO> frecuencias;
+    private List<EquipoTecnologiaBandaDTO> bandas;
+    
+}

src/main/java/amx/ccie/dto/EquipoTecnologiaFrecuenciaDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class EquipoTecnologiaFrecuenciaDTO {
+    private String frecuencia;
+}

src/main/java/amx/ccie/dto/LineasAerNavDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class LineasAerNavDTO {
+    
+    private List<PaquetesClavesDTO> data;
+    private Boolean success;
+    
+    @Override
+    public String toString() {
+        return "ResponseDTO{data=" + data + ", success=" + success + "}";
+    }
+    
+}

src/main/java/amx/ccie/dto/OperadorDTO.java

+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class OperadorDTO {
+     private Long id;
+    private String nombre;
+}

src/main/java/amx/ccie/dto/PaisDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class PaisDTO {
+    
+    private Long id;
+    private String pais;
+    private CatalogoDTO zona;
+    private CatalogoDTO tipoCobertura;
+    
+    @Override
+    public String toString() {
+        return "R_PaisesDTO{id=" + id + ", pais='" + pais + "', zona=" + zona + ", tipoCobertura=" + tipoCobertura + "}";
+    }
+}

src/main/java/amx/ccie/dto/PaqTarRoamingResponseDTO.java

+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class PaqTarRoamingResponseDTO {
+    
+    private List<PaquetesClavesPaqDTO> data;
+    private Boolean success;
+    
+}

src/main/java/amx/ccie/dto/PaqueteConceptoDTO.java

+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class PaqueteConceptoDTO {
+    private Long idPaquete;
+    private Long idOpcion;
+    private String valor;
+    private String nombre;
+    private int orden;
+}

src/main/java/amx/ccie/dto/PaqueteDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class PaqueteDTO {
+    private Long idPaquete;
+    private Long idOpcion;
+    private String recomendado;
+    private String contratacion1;
+    private String contratacion2;
+    private String contratacion3;
+    private String leyendaDestacado;
+    private String colorDestacado;
+    private String imagenDestacado;
+    private int titulo;
+    private String leyenda1;
+    private String nombrePaquete;
+    private String leyenda2;
+    private int compraLinea;
+    private String leyendaCompraLinea;
+    private String toolTipCompraLinea;
+    private String botonCompraLinea;
+    private String linkCompraLinea;
+    private int targetCompraLinea;
+    private String claveCompraLinea;
+    private int compraMiTelcel;
+    private String leyendaMiTelcel;
+    private String toolTipMiTelcel;
+    private String botonMiTelcel;
+    private String linkMiTelcel;
+    private int targetMiTelcel;
+    private int compraSms;
+    private String leyendaSmsDemanda;
+    private String claveSmsDemanda;
+    private String leyendaSmsRecurrente;
+    private String claveSmsRecurrente;
+    private int compraTelefono;
+    private String leyendaTelefono;
+    private String claveTelefono;
+    private String leyendaOtroTelefono;
+    private String claveOtroTelefono;
+    private int appTelcel;
+    private String leyendaAppTelcel;
+    private String googlePlayLink;
+    private String appStoreLink;
+    private List<ClavesDTO> paqClaves;
+    private List<ConceptoRoamingPaqueteDTO> conceptos;
+    private List<CatalogoDTO> tooltip;
+    private List<CatalogoDTO> paquetesClaves;
+}

src/main/java/amx/ccie/dto/PaqueteInternetDTO.java

+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class PaqueteInternetDTO {
+    
+    private Long id;
+    private String nombre;
+    private String descripcion;
+    private String tipoServicio;
+    private int region;
+    private String estatus;
+    private int prioridad;
+    private int isTelcel;
+    private boolean isTarifa;
+    private String servicios;
+    private String promoRegalo;
+    private CatalogoDTO cobertura;
+    private List<CatalogoDTO> tipoEquipo;
+    private CatalogoDTO modalidad;
+    private List<RoamingPaisDTO> paises;
+    private List<RoamingTransporteDTO> transportes;
+    private List<ServicioDTO> servicio;
+    private String descripcionCobertura;
+    private String terminosYCondiciones;
+    private String legales;
+    private String idZona;
+    private List<PaqueteDTO> paquetes;
+    private String urlImg;
+    private int colorFondo;
+    
+}

src/main/java/amx/ccie/dto/PaqueteInternetLiteDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class PaqueteInternetLiteDTO {
+    private Long id;
+    private String nombre;
+    private String descripcion;
+    private String tipoServicio;
+    private int region;
+    private CatalogoDTO cobertura;
+    private CatalogoDTO modalidad;
+    private String descripcionCobertura;
+    private String terminosYCondiciones;
+    private String legales;
+    private String idZona;
+    private List<PaqueteDTO> paquetes;
+    private boolean tarifa;
+}

src/main/java/amx/ccie/dto/PaqueteInternetLiteResponseDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+
+/**
+ *
+ * @author montielj
+ */
+public class PaqueteInternetLiteResponseDTO {
+    private String success;
+    private List<PaqueteInternetLiteDTO> data;
+}

src/main/java/amx/ccie/dto/PaqueteInternetResponseDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+
+/**
+ *
+ * @author montielj
+ */
+public class PaqueteInternetResponseDTO {
+    private String success;
+    private List<PaqueteInternetDTO> data;
+}

src/main/java/amx/ccie/dto/PaqueteLiteDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class PaqueteLiteDTO {
+    private Long idPaquete;
+    private String nombrePaquete;
+    private String claveSmsDemanda;
+    private List<PaqueteConceptoDTO> conceptos;
+    private List<ClavesDTO> paqClaves;
+}

src/main/java/amx/ccie/dto/PaquetesClavesDTO.java

+package amx.ccie.dto;
+
+import lombok.Data;
+
+@Data
+public class PaquetesClavesDTO {
+    
+    private Long id;
+    private String lineaNaviera;
+    private CatalogoDTO zona;
+    private CatalogoDTO tipoCobertura;
+    private CatalogoDTO subLineas;
+
+    @Override
+    public String toString() {
+        return "PaquetesClavesDTO{id=" + id + ", lineaNaviera='" + lineaNaviera + "', zona=" + zona +
+                ", tipoCobertura=" + tipoCobertura + ", subLineas=" + subLineas + "}";
+    }
+}
+

src/main/java/amx/ccie/dto/PaquetesClavesPaqDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+import java.util.Map;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class PaquetesClavesPaqDTO {
+    
+    private String id;
+    private Long idPaquete;
+    private Long idOpcion;
+    private String nombre;
+    private String estatus;
+    private Long prioridad;
+    private CatalogoDTO cobertura;
+    private List<CatalogoDTO> paises;
+    private List<ConceptoRoamingPaqueteDTO> conceptos;
+    private CatalogoDTO zona;
+    private CatalogoDTO modalidad;
+    private boolean isTarifa;
+    private List<String> servicio;
+    private Map<String, List<ClavesDTO>> paqClaves;
+    
+}

src/main/java/amx/ccie/dto/RoamingCoberturaDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class RoamingCoberturaDTO {
+    
+    private String id;
+    private Long idConvenio;
+    private OperadorDTO operador;
+    private String mapaUrlGsm;
+    private String mapaUrl3g;
+    private String mapaUrl4g;
+    private List<ServicioDTO> servicios;
+    private List<CatalogoDTO> modalidades;
+    private List<EquipoTecnologiaDTO> tecnologias;
+    private CatalogoDTO cobertura;
+    private RoamingPaisDTO pais;
+    private RoamingLineaDTO linea;
+    private String esCiudad;
+    private List<String> tecnologiaArray;
+    
+}

src/main/java/amx/ccie/dto/RoamingLineaDTO.java

+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class RoamingLineaDTO {
+    
+    private Long idLinea;
+    private String nombreLinea;
+    private RoamingTransporteDTO transporte;
+    
+}

src/main/java/amx/ccie/dto/RoamingPaisDTO.java

+package amx.ccie.dto;
+
+import java.util.List;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class RoamingPaisDTO {
+    
+    private Long id;
+    private String nombre;
+    private String nombreIngles;
+    private Boolean mostrarCiudades;
+    private CiudadDTO ciudad;
+    private List<CiudadDTO> ciudades;
+    
+}

src/main/java/amx/ccie/dto/RoamingTransporteDTO.java

+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class RoamingTransporteDTO {
+    private Long id;
+    private String transporte;
+    private String ruta;
+}

src/main/java/amx/ccie/dto/ServicioCatalogoDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class ServicioCatalogoDTO {
+    
+    private Boolean valor;
+    private String nombre;
+    
+}

src/main/java/amx/ccie/dto/ServicioDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class ServicioDTO {
+    
+    @JsonProperty("a_voz")
+    private ServicioCatalogoDTO aVoz;
+
+    @JsonProperty("b_sms")
+    private ServicioCatalogoDTO bSms;
+
+    @JsonProperty("c_mms")
+    private ServicioCatalogoDTO cMms;
+
+    @JsonProperty("d_gprs")
+    private ServicioCatalogoDTO dGprs;
+
+    @JsonProperty("e_tresg")
+    private ServicioCatalogoDTO eTresg;
+
+    @JsonProperty("f_lte")
+    private ServicioCatalogoDTO fLte;
+
+    @JsonProperty("g_buzon886")
+    private ServicioCatalogoDTO gBuzon886;
+
+    @JsonProperty("h_buzonauto")
+    private ServicioCatalogoDTO hBuzonauto;
+
+    @JsonProperty("i_datos")
+    private ServicioCatalogoDTO iDatos;
+
+    @JsonProperty("j_roamingModalidad")
+    private CatalogoDTO jRoamingModalidad;
+}

src/main/java/amx/ccie/dto/ServicioValDTO.java

+/*
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Licenses/license-default.txt to change this license
+ * Click nbfs://nbhost/SystemFileSystem/Templates/Classes/Class.java to edit this template
+ */
+package amx.ccie.dto;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class ServicioValDTO {
+    private String value;
+}

src/main/java/amx/ccie/etl/dao/BitacoraDAO.java

+package amx.ccie.etl.dao;
+
+import amx.ccie.etl.util.BitacoraDTO;
+import amx.ccie.etl.util.Conexion;
+import java.sql.CallableStatement;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import oracle.jdbc.OracleTypes;
+
+/**
+ *
+ * @author montielj
+ */
+public class BitacoraDAO extends Conexion {
+    
+    public List<BitacoraDTO> getBitacora() {
+        List<BitacoraDTO> data = new ArrayList<>();
+        StringBuilder sql = new StringBuilder();
+        sql.append("{call ").append(getEsq_amx()).append(getPkg_pref()).append("UTIL.").append("USP_GET_CATALOGOS").append("(?,?,?)}");
+        try (Connection conn = getConnection();
+            CallableStatement cs = conn.prepareCall(sql.toString())) {
+            
+            cs.registerOutParameter(1, OracleTypes.CURSOR); // CURSOR_OUT
+            cs.registerOutParameter(2, OracleTypes.INTEGER); // ESTATUS_OUT
+            cs.registerOutParameter(3, OracleTypes.VARCHAR); // MSG_OUT
+
+            cs.execute();
+
+            int estatus = cs.getInt(2);
+            if (estatus == 1) { // Éxito
+                try (ResultSet rs = (ResultSet) cs.getObject(1)) {
+                    while (rs.next()) {
+                        BitacoraDTO dto = new BitacoraDTO();
+                        dto.setId(rs.getInt("id"));
+                        dto.setDescripcion(rs.getString("clave"));
+                        dto.setEstatus(rs.getInt("estatus"));
+                        data.add(dto);
+                    }
+                }
+            } else {
+                throw new SQLException(cs.getString(3));
+            }
+
+        } catch (SQLException e) {
+            e.printStackTrace(); // Manejo de errores
+        }
+        return data;
+    }
+    
+}

src/main/java/amx/ccie/etl/httpClient/TestApisEmpleado.java

@@ -16,7 +16,7 @@ import java.util.Scanner;
  * @author David Coronilla
  */
 public class TestApisEmpleado {
-    private final String URL = "https://reqres.in/api/users";
+    private final String URL = ResourceBundle.getBundle("RecursosSistema").getString("URL_CAT_EMPLEADO");//"https://reqres.in/api/users";
     
     public TestApisEmpleado(){}
     

src/main/java/amx/ccie/etl/httpClient/TestApisReporte.java

@@ -16,7 +16,7 @@ import java.util.Scanner;
  */
 public class TestApisReporte {
     
-    private final String URL = "https://www.rsvamx.com:8081/amxmovil-servicefrontera-ventas/api/ventas/competidores/reporte/broadband-pdm-pais";
+    private final String URL =  ResourceBundle.getBundle("RecursosSistema").getString("URL_REPORTE_PDM");//"https://www.rsvamx.com:8081/amxmovil-servicefrontera-ventas/api/ventas/competidores/reporte/broadband-pdm-pais";
     private final String TOKEN = "eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VycGRtY29tIiwiaWF0IjoxNzIzMjM0Mjg2LCJleHAiOjE3NTQwMjQ0MDB9.3n9SQyksOk8EaUilIIRTA4cytmxI8aYVV_L12yk-EfA";
     
     public TestApisReporte(){}

src/main/java/amx/ccie/etl/scheduler/CatalogoScheduler.java

 package amx.ccie.etl.scheduler;
 
+import amx.ccie.etl.dao.BitacoraDAO;
 import amx.ccie.etl.httpClient.TestApisEmpleado;
 import amx.ccie.etl.httpClient.TestApisReporte;
+import amx.ccie.etl.util.BitacoraDTO;
 import java.net.MalformedURLException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
+import java.util.List;
 import javax.ejb.Schedule;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 /**
  *
@@ -17,20 +23,25 @@ import javax.ejb.Startup;
 @Startup
 public class CatalogoScheduler {
     
+    private final Logger log = LogManager.getLogger(this.getClass());
     
-    
-    @Schedule(hour = "16", minute = "20", second = "0", persistent = false)
-    //@Schedule(dayOfMonth = "15", hour = "19", minute = "58", second = "0", persistent = false)
+    @Schedule(hour = "13", minute = "35", second = "0", persistent = false)
     public void consultarCatalogoServicio() {
         try {
+            List<BitacoraDTO> bitacora = new BitacoraDAO().getBitacora();
+            bitacora.stream().forEach(cat -> System.out.println("Hola mundo catalogo: " + cat.getDescripcion()));
+            
+            log.info("Se ejecuta servicio de empleado.");
             new TestApisEmpleado().getEmpleado();
+            log.info("Se ejecuta servicio de reporte.");
             new  TestApisReporte().getReporte();
+            log.info("Servicios ejecutados correctamente.");
         } catch (MalformedURLException ex) {
-            ex.printStackTrace();
+            log.error("Exception: {}", ex.getMessage());
         } catch (KeyManagementException | NoSuchAlgorithmException ex) {
-            ex.printStackTrace();
+            log.error("Exception: {}", ex.getMessage());
         } catch (Exception ex) {
-            ex.printStackTrace();
+            log.error("Exception: {}", ex.getMessage());
         }
     }
     

src/main/java/amx/ccie/etl/util/BitacoraDTO.java

+package amx.ccie.etl.util;
+
+import lombok.Data;
+
+/**
+ *
+ * @author montielj
+ */
+@Data
+public class BitacoraDTO {
+    
+    private int id;
+    private String descripcion;
+    private int estatus;
+    
+}

src/main/java/amx/ccie/etl/util/Conexion.java

+package amx.ccie.etl.util;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import javax.sql.DataSource;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+public class Conexion {
+
+    private final Logger log = LogManager.getLogger(this.getClass());
+    private final String esq_amx  = "AMX_"+ConstantsArc.getAmxProject()+".";
+    private final String pkg_pref = "PKG_"+ConstantsArc.getAmxProject()+"_";
+    
+    private DataSource dsOracle;
+    
+   
+    public Connection getConnection() {
+
+        try {
+            try{
+                InitialContext ctx = new InitialContext();   
+                dsOracle = (DataSource)ctx.lookup("jdbc/amx_"+ConstantsArc.getAmxProject().toLowerCase());
+            }catch(NamingException n){
+                log.error("catch NamingException. No se pudo encontró el nombre del DataSoruce");
+            }
+            
+            if (dsOracle == null) {
+                throw new SQLException("No se encontro DataSource");
+            }
+            
+            Connection conn = dsOracle.getConnection();
+            if (conn == null) {
+                throw new SQLException("No se pudo establecer una conexion");
+            }
+            return conn;
+
+        } catch (SQLException e) {
+            log.error("Error al conectar por medio del jdbc/amx_"+ConstantsArc.getAmxProject().toLowerCase(),e);
+            return null;
+        }
+    }
+
+    public void closeResources(Connection conn, Statement stmt, ResultSet rs) {
+        if(rs != null){
+            try {
+                rs.close();
+            } catch (SQLException er) {
+                log.error(er.getMessage());
+            }
+        }
+        if(stmt != null){
+            try {
+                stmt.close();
+            } catch (SQLException es) {
+                log.error(es.getMessage());
+            }
+        }
+        if(conn != null){
+            try {
+                conn.close();
+            } catch (SQLException ec) {
+                log.error(ec.getMessage());
+            }
+        }
+    }
+
+    public void rollback(Connection conn) {
+        try {
+            conn.rollback();
+        } catch (SQLException es) {
+            log.error(es.getMessage());
+        }
+    }
+
+    public String getEsq_amx() {
+        return esq_amx;
+    }
+
+	public String getPkg_pref() {
+		return pkg_pref;
+	}
+    
+}
\ No newline at end of file

src/main/java/amx/ccie/etl/util/ConstantsArc.java

+package amx.ccie.etl.util;
+
+/**
+ *
+ * @author montielj
+ */
+public class ConstantsArc {	
+	private static final String HEADER_PROJECT="CCInterno";
+	private static final String AMX_PROJECT="CCI";
+	private static final int KEY_PWD=1;
+	private static final int KEY_MAIL=2;
+	
+	public static String getHeaderProject() {
+		return HEADER_PROJECT;
+	}
+	
+	public static String getAmxProject() {
+		return AMX_PROJECT;
+	}
+
+	public static int getKeyPwd() {
+		return KEY_PWD;
+	}
+
+	public static int getKeyMail() {
+		return KEY_MAIL;
+	}
+	
+}

src/main/resources/RecursosSistema.properties

+URL_REPORTE_PDM=https://www.rsvamx.com:8081/amxmovil-servicefrontera-ventas/api/ventas/competidores/reporte/broadband-pdm-pais
+URL_CAT_EMPLEADO=https://reqres.in/api/users
+URL_CAT_POKEMON=https://pokeapi.co/api/v2/language/9
\ No newline at end of file

src/main/resources/log4j2.properties

+status = warn
+name = PropertiesConfig
+
+##Liberar servidor local
+property.filename = C:/logs/app/
+
+##Liberar servidor desarrollo
+#property.filename = /home/adminsecret/log/web/
+
+##Liberar servidor productivo
+#property.filename = /home/adminappamx/log/web/
+
+#Configuracion consola de logs
+appender.console.type = Console
+appender.console.name = CONSOLE_DEBUG
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p (%c{1}:%L) - %m%n
+
+# Configuring filters
+appender.console.filter.levelMatch.type = LevelMatchFilter
+appender.console.filter.levelMatch.level = DEBUG
+appender.console.filter.levelMatch.onMatch = ACCEPT
+appender.console.filter.levelMatch.onMismatch = DENY
+
+#Configuracion archivos de logs info
+appender.file_info.type = File
+appender.file_info.name = FILE_INFO
+appender.file_info.fileName = ${filename}/AMX_ETL_CCI.log
+appender.file_info.filePattern = ${filename}/AMX_ETL_CCI-%d{MM-dd-yyyy}-%i.log.gz
+appender.file_info.layout.type = PatternLayout
+appender.file_info.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p (%c{1}:%L) - %m%n
+appender.file_info.policies.type = Policies
+appender.file_info.policies.size.type = SizeBasedTriggeringPolicy
+appender.file_info.policies.size.size = 5120KB
+appender.file_info.strategy.type = DefaultRolloverStrategy
+appender.file_info.strategy.max = 7
+
+# Configuring filters
+appender.file_info.filter.levelMatch.type = LevelMatchFilter
+appender.file_info.filter.levelMatch.level = INFO
+appender.file_info.filter.levelMatch.onMatch = ACCEPT
+appender.file_info.filter.levelMatch.onMismatch = DENY
+
+#Configuracion archivos de logs error y fatal
+appender.file_error.type = File
+appender.file_error.name = FILE_ERROR
+appender.file_error.fileName = ${filename}/AMX_ETL_CCI_ERROR.log
+appender.file_error.filePattern = ${filename}/AMX_ETL_CCI_ERROR-%d{MM-dd-yyyy}-%i.log.gz
+appender.file_error.layout.type = PatternLayout
+appender.file_error.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p (%c{1}:%L) - %m%n
+appender.file_error.policies.type = Policies
+appender.file_error.policies.size.type = SizeBasedTriggeringPolicy
+appender.file_error.policies.size.size = 5120KB
+appender.file_error.strategy.type = DefaultRolloverStrategy
+appender.file_error.strategy.max = 7
+
+# Configuring filters
+appender.file_error.filter.threshold.type = ThresholdFilter
+appender.file_error.filter.threshold.level = ERROR
+appender.file_error.filter.threshold.onMatch = ACCEPT
+appender.file_error.filter.threshold.onMismatch = DENY
+
+#Configuracion archivos de logs warn
+appender.file_warn.type = File
+appender.file_warn.name = FILE_WARN
+appender.file_warn.fileName = ${filename}/AMX_ETL_CCI_WARN.log
+appender.file_warn.filePattern = ${filename}/AMX_ETL_CCI_WARN-%d{MM-dd-yyyy}-%i.log.gz
+appender.file_warn.layout.type = PatternLayout
+appender.file_warn.layout.pattern = %d{yyyy-MM-dd HH:mm:ss} %-5p (%c{1}:%L) - %m%n
+appender.file_warn.policies.type = Policies
+appender.file_warn.policies.size.type = SizeBasedTriggeringPolicy
+appender.file_warn.policies.size.size = 5120KB
+appender.file_warn.strategy.type = DefaultRolloverStrategy
+appender.file_warn.strategy.max = 7
+
+# Configuring filters
+appender.file_warn.filter.levelMatch.type = LevelMatchFilter
+appender.file_warn.filter.levelMatch.level = WARN
+appender.file_warn.filter.levelMatch.onMatch = ACCEPT
+appender.file_warn.filter.levelMatch.onMismatch = DENY
+
+
+#Configuraciones generales
+rootLogger = debug, CONSOLE_DEBUG, FILE_INFO, FILE_ERROR, FILE_WARN
+rootLogger.appenderRef.console.ref = CONSOLE_DEBUG
+rootLogger.appenderRef.file_info.ref = FILE_INFO
+rootLogger.appenderRef.file_error.ref = FILE_ERROR
+rootLogger.appenderRef.file_warn.ref = FILE_WARN
\ No newline at end of file