diff --git a/pom.xml b/pom.xml index 219ee84..7d724fc 100644 --- a/pom.xml +++ b/pom.xml @@ -93,6 +93,12 @@ ojdbc8 + + mysql + mysql-connector-java + 8.0.33 + + org.springframework.boot @@ -172,11 +178,7 @@ 7.0.3 - - com.lowagie - itext - 2.1.7.js10 - + diff --git a/src/main/bundles/prod.bundle b/src/main/bundles/prod.bundle index 8468c08..2a14c7c 100644 Binary files a/src/main/bundles/prod.bundle and b/src/main/bundles/prod.bundle differ diff --git a/src/main/java/mx/gob/jumapacelaya/services/DatabaseService.java b/src/main/java/mx/gob/jumapacelaya/services/DatabaseService.java index 6055988..ed01772 100644 --- a/src/main/java/mx/gob/jumapacelaya/services/DatabaseService.java +++ b/src/main/java/mx/gob/jumapacelaya/services/DatabaseService.java @@ -342,7 +342,7 @@ public class DatabaseService { String smtSignatureBase64, String planAnualId) { String query = "INSERT INTO MANTENIMIENTOS (fecha, tipoMantId, departamentoId, empleadoId, formaMant, nombreequipo," + - " firmaUsuario, firmaSmt, planAnualId) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?) RETURNING MANTENIMIENTOID INTO ?"; + " firmaUsuario, firmaSmt, planAnualId) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"; String updateStatusQuery = "UPDATE PLANANUAL SET estado = 'REALIZADO' WHERE planAnualId = ?"; @@ -360,7 +360,7 @@ public class DatabaseService { connection.setAutoCommit(false); // Paso 1: primero inserta el mantenimiento - try (OraclePreparedStatement preparedStatement = (OraclePreparedStatement) connection.prepareStatement(query)) { + try (PreparedStatement preparedStatement = connection.prepareStatement(query, Statement.RETURN_GENERATED_KEYS)) { preparedStatement.setDate(1, Date.valueOf(fecha)); preparedStatement.setLong(2, Long.parseLong(tipoMantId)); @@ -383,13 +383,12 @@ public class DatabaseService { preparedStatement.setLong(9, Long.parseLong(planAnualId)); - preparedStatement.registerReturnParameter(10, Types.NUMERIC); - preparedStatement.executeUpdate(); - ResultSet rs = preparedStatement.getReturnResultSet(); - if (rs != null && rs.next()) { - nuevoId = rs.getInt(1); + try (ResultSet rs = preparedStatement.getGeneratedKeys()) { + if (rs.next()) { + nuevoId = rs.getInt(1); + } } } diff --git a/src/main/resources/META-INF/resources/reportes/mantenimientoReport.jasper b/src/main/resources/META-INF/resources/reportes/mantenimientoReport.jasper index 0628cd0..5a68fb7 100644 Binary files a/src/main/resources/META-INF/resources/reportes/mantenimientoReport.jasper and b/src/main/resources/META-INF/resources/reportes/mantenimientoReport.jasper differ diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 9520597..5240f8b 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -1,4 +1,4 @@ #Configuracion de la base de datos -db.url=jdbc:oracle:thin:@//localhost:1521/XEPDB1 -db.user=MANTENIMIENTOS_PRB +db.url=jdbc:mysql://localhost:3307/mantenimientosdb +db.user=mantenimientos db.pass=mantenimientos \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index b2ce21c..c908743 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -1,5 +1,5 @@ #Configuracion de la base de datos -db.url=jdbc:oracle:thin:@//oracle-xe:1521/XEPDB1 +db.url=jdbc:mysql://db:3306/mantenimientosdb #db.url=jdbc:oracle:thin:@//SVRAPPS:1521/XEPDB1 -db.user=MANTENIMIENTOS +db.user=mantenimientos db.pass=mantenimientos \ No newline at end of file