Browse Source

Se cambio la base de datos completa y tambien se agrego el reporte imprimible del mantenimiento

master
mramirezg 2 weeks ago
parent
commit
ec6f42542d
6 changed files with 17 additions and 16 deletions
  1. +7
    -5
      pom.xml
  2. BIN
      src/main/bundles/prod.bundle
  3. +6
    -7
      src/main/java/mx/gob/jumapacelaya/services/DatabaseService.java
  4. BIN
      src/main/resources/META-INF/resources/reportes/mantenimientoReport.jasper
  5. +2
    -2
      src/main/resources/application-dev.properties
  6. +2
    -2
      src/main/resources/application-prod.properties

+ 7
- 5
pom.xml View File

@ -93,6 +93,12 @@
<artifactId>ojdbc8</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>8.0.33</version>
</dependency>
<dependency>
<!-- Dependencia para poder enviar correos -->
<groupId>org.springframework.boot</groupId>
@ -172,11 +178,7 @@
<version>7.0.3</version>
</dependency>
<dependency>
<groupId>com.lowagie</groupId>
<artifactId>itext</artifactId>
<version>2.1.7.js10</version>
</dependency>
</dependencies>
<build>


BIN
src/main/bundles/prod.bundle View File


+ 6
- 7
src/main/java/mx/gob/jumapacelaya/services/DatabaseService.java View File

@ -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);
}
}
}


BIN
src/main/resources/META-INF/resources/reportes/mantenimientoReport.jasper View File


+ 2
- 2
src/main/resources/application-dev.properties View File

@ -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

+ 2
- 2
src/main/resources/application-prod.properties View File

@ -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

Loading…
Cancel
Save