fabio
/
AdmMono
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RollBack para correção do build

master
Fabio Faria 2022-03-28 19:53:47 -03:00
parent c362d49895
commit 9e694510ce
5 changed files with 102 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,4 +9,3 @@
/.settings/org.hibernate.eclipse.console.prefs
/.settings/org.jboss.ide.eclipse.as.core.prefs
/target/
/.settings/

40
pom.xml
View File

@ -5,41 +5,27 @@
<artifactId>modelWeb</artifactId>
<version>1.0.0</version>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<java.version>1.8</java.version>
<project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
</properties>
<distributionManagement>
<repository>
<id>rj-releases</id>
<url>http://52.5.53.15:8081/nexus/content/repositories/releases/</url>
</repository>
</distributionManagement>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.1</version>
<configuration>
<tagNameFormat>@{project.version}</tagNameFormat>
<source>1.8</source>
<target>1.8</target>
<encoding>ISO-8859-1</encoding>
</configuration>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.sonarsource.scanner.maven</groupId>
<artifactId>sonar-maven-plugin</artifactId>
<version>3.9.1</version>
</plugin>
</plugins>
</pluginManagement>
</build>
<dependencies>

5
src/com/rjconsultores/ventaboletos/dao/RemessaCNABBancosDAO.java
View File

@ -1,5 +1,6 @@
package com.rjconsultores.ventaboletos.dao;
import java.sql.SQLException;
import java.util.Date;
import java.util.List;
@ -30,4 +31,8 @@ public interface RemessaCNABBancosDAO extends GenericDAO<FechamentoBoleto, Long>
public List<Empresa> getEmpresas();
public Boolean atualizaRemessa(Empresa empresa, ArquivoRemessa arquivoRemessa) throws Exception;
public FechamentoBoleto obtenerFechamentoBoletoPorNossoNumero(String nossoNumero, Integer empresaId);
public boolean quitarFechamentoBoleto(Long fechamentoboletoId, Integer usuarioId) throws SQLException;
}

67
src/com/rjconsultores/ventaboletos/dao/hibernate/RemessaCNABBancosHibernateDAO.java
View File

@ -3,6 +3,7 @@ package com.rjconsultores.ventaboletos.dao.hibernate;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
import java.text.DateFormat;
import java.text.DecimalFormat;
@ -15,6 +16,11 @@ import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.hibernate.Query;
import org.hibernate.SessionFactory;
import org.hibernate.transform.AliasToBeanResultTransformer;
import org.hibernate.type.BooleanType;
import org.hibernate.type.IntegerType;
import org.hibernate.type.LongType;
import org.hibernate.type.StringType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Repository;
@ -1678,4 +1684,65 @@ public class RemessaCNABBancosHibernateDAO extends GenericHibernateDAO<Fechament
}
}
@Override
public FechamentoBoleto obtenerFechamentoBoletoPorNossoNumero(String nossoNumero, Integer empresaId) {
StringBuilder sb = new StringBuilder();
sb.append(" SELECT ");
sb.append(" fb.FECHAMENTOBOLETO_ID AS fechamentoboletoId, ");
sb.append(" fb.nossonumero, ");
sb.append(" fb.FECDOCUMENTO, ");
sb.append(" fb.FECVENCIMENTO, ");
sb.append(" fb.VALORDOCUMENTO, ");
sb.append(" fb.STATUS as status, ");
sb.append(" fb.REMESSA_ID as remessaId, ");
sb.append(" fb.indboletoquitado as indBoletoQuitado ");
sb.append(" FROM ");
sb.append(" FECHAMENTO_BOLETO fb ");
sb.append(" INNER JOIN FECHAMENTO_CNTCORRENTE fc on fb.FECHAMENTOCNTCORRENTE_ID = fc.FECHAMENTOCNTCORRENTE_ID AND fc.ACTIVO = 1 ");
sb.append(" WHERE fb.activo = 1 ");
sb.append(" AND (fb.nossonumero = :nossoNumero ");
sb.append(" OR fb.nossonumero like :nossoNumeroComDigito ) ");
sb.append(" AND fc.EMPRESA_ID = :empresaId ");
Query query = getSession().createSQLQuery(sb.toString())
.addScalar("fechamentoboletoId", LongType.INSTANCE)
.addScalar("nossonumero", StringType.INSTANCE)
.addScalar("status", StringType.INSTANCE)
.addScalar("remessaId", IntegerType.INSTANCE)
.addScalar("indBoletoQuitado", BooleanType.INSTANCE)
.setResultTransformer(new AliasToBeanResultTransformer(FechamentoBoleto.class));
query.setString("nossoNumero", nossoNumero);
query.setString("nossoNumeroComDigito", nossoNumero+"-_");
query.setInteger("empresaId", empresaId);
FechamentoBoleto retorno = (FechamentoBoleto)query.uniqueResult();
return retorno;
}
@Override
public boolean quitarFechamentoBoleto(Long fechamentoboletoId, Integer usuarioId) throws SQLException {
@SuppressWarnings("deprecation")
Connection con = getSession().connection();
Statement stmt = con.createStatement();
con.setAutoCommit(false);
StringBuilder qry = new StringBuilder();
qry.append(" update FECHAMENTO_BOLETO set INDBOLETOQUITADO = 1, ");
qry.append(" FECMODIF = SYSDATE, ");
qry.append(" USUARIO_ID_QUITA = ").append(usuarioId);
qry.append(" where FECHAMENTOBOLETO_ID = ").append(fechamentoboletoId);
qry.append(" AND ACTIVO = 1 ");
int qtd = stmt.executeUpdate(qry.toString());
con.commit();
stmt.close();
return qtd==1;
}
}

17
src/com/rjconsultores/ventaboletos/entidad/FechamentoBoleto.java
View File

@ -82,6 +82,11 @@ public class FechamentoBoleto implements java.io.Serializable{
@Column(name = "PORC_MORA", precision = 5, scale = 2)
private BigDecimal porcentagemMora;
@Column(name = "INDBOLETOQUITADO")
private Boolean indBoletoQuitado;
@Column(name = "USUARIO_ID_QUITA")
private Integer usuarioQuitacao;
public Long getFechamentoboletoId() {
return fechamentoboletoId;
@ -205,4 +210,16 @@ public class FechamentoBoleto implements java.io.Serializable{
public void setPorcentagemMora(BigDecimal porcentagemMora) {
this.porcentagemMora = porcentagemMora;
}
public Boolean getIndBoletoQuitado() {
return indBoletoQuitado;
}
public void setIndBoletoQuitado(Boolean indBoletoQuitado) {
this.indBoletoQuitado = indBoletoQuitado;
}
public Integer getUsuarioQuitacao() {
return usuarioQuitacao;
}
public void setUsuarioQuitacao(Integer usuarioQuitacao) {
this.usuarioQuitacao = usuarioQuitacao;
}
}