diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..b63430a5d --- /dev/null +++ b/pom.xml @@ -0,0 +1,216 @@ + + 4.0.0 + com.rjconsultores + modelWeb + 0.0.1-SNAPSHOT + + src + + + src + + **/*.java + + + + + + maven-compiler-plugin + 3.8.0 + + 1.6 + 1.6 + + + + + + + + antlr + antlr + 2.7.6 + + + + asm + asm + 2.2.2 + + + + axis + axis + 1.4 + + + + br.com.rjconsultores + brazilutils + 0.1.1 + + + + javax.mail + javax.mail-api + 1.4.4 + + + + org.jboss.resteasy + resteasy-jaxrs + 2.2.1.GA + + + + commons-dbutils + commons-dbutils + 1.6 + + + + org.codehaus.jettison + jettison + 1.0.1 + + + + commons-collections + commons-collections + 3.2.1 + + + + net.sf.jasperreports + jasperreports + 5.1.0 + + + + commons-lang + commons-lang + 2.2 + + + + org.springframework + spring-beans + 3.0.6.RELEASE + + + + org.springframework + spring-context + 3.0.6.RELEASE + + + + org.springframework + spring-tx + 3.0.6.RELEASE + + + + org.springframework + spring-web + 3.0.6.RELEASE + + + + org.springframework.security + spring-security-core + 3.0.6.RELEASE + + + + org.springframework + spring-orm + 3.0.6.RELEASE + + + + org.zkoss.zk + zul + 5.0.9 + + + + org.zkoss.zk + zkplus + 5.0.9 + + + + com.google.code.gson + gson + 2.3.1 + + + + org.json + json + 20140107 + + + + org.jboss.logging + jboss-logging + 3.0.0.GA + + + + javax.persistence + ejb3-persistence + 3.0 + + + + org.hibernate + hibernate-core + 3.6.6.Final + + + + log4j + log4j + 1.2.16 + + + + org.apache.poi + poi-ooxml + 3.8 + + + + org.apache.poi + poi + 3.8 + + + + javax.servlet + javax.servlet-api + 3.1.0 + provided + + + + br.com.rjconsultores + GeneradorBoletosCNAB + 0.0.1-SNAPSHOT + + + + br.com.rjconsultores + WSAG + 0.0.1-SNAPSHOT + + + + br.com.rjconsultores + WSTotvs + 0.0.1-SNAPSHOT + + + \ No newline at end of file diff --git a/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java b/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java index a9307fc58..e7ffebb90 100644 --- a/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java +++ b/src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java @@ -10,7 +10,6 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.criterion.Restrictions; import org.hibernate.type.Type; -import org.jfree.util.Log; import com.rjconsultores.ventaboletos.auditoria.AuditControl; import com.rjconsultores.ventaboletos.auditoria.AuditManager; @@ -163,7 +162,7 @@ public class AuditInterceptor extends EmptyInterceptor { FuncionSistema funcionSistema = (FuncionSistema) criteriaFuncionSistema.uniqueResult(); if (funcionSistema == null) { - Log.info("Função sistema " + funcionSistema + " não encontrada na base de dados."); + log.info("Função sistema " + funcionSistema + " não encontrada na base de dados."); AuditManager.getINSTANCE().setCurrentService(auditService); return false; diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java index 5e2626daa..4eac1b303 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java @@ -50,6 +50,7 @@ import com.rjconsultores.ventaboletos.vo.caja.UsuarioVO; import com.rjconsultores.ventaboletos.vo.caja.VendaEmbarcadaVO; @Repository("cajaDAO") +@SuppressWarnings("unchecked") public class CajaHibernateDAO extends GenericHibernateDAO implements CajaDAO { private static Logger log = org.slf4j.LoggerFactory.getLogger(CajaHibernateDAO.class); @@ -189,7 +190,6 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class)); - @SuppressWarnings("unchecked") List lsBusca = sql.list(); List lsResultado = new ArrayList(); @@ -564,7 +564,6 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen return new BigDecimal(chave += seq); } - @SuppressWarnings("unchecked") private List carregarDadosDeposito(Long cajaId, Integer formapagoId) { StringBuilder sQuery = new StringBuilder(); sQuery.append("SELECT CDDP.IDENTIFICACAO_DEPOSITO, CDDP.IMPORTE, CDDP.FECDEPOSITO ") @@ -590,7 +589,6 @@ public class CajaHibernateDAO extends GenericHibernateDAO implemen return TipoFormapago.DEPOSITO.equals(tipoFormapago); } - @SuppressWarnings("unchecked") @Override public Map> buscarCajaYTarjeta(String... numoperacionList) { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java index 4c791492f..e8405d8e2 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java @@ -3703,8 +3703,8 @@ public class FiscalHibernateDAO extends HibernateDaoSupport implements FiscalDAO if (isCancelamento) { ps.setLong("RMD_ID", rmdId); - ps.setLong("FOLIO_INICIAL", NumberUtils.toLong(folioInicial)); - ps.setLong("FOLIO_FINAL", NumberUtils.toLong(folioFinal)); + ps.setLong("FOLIO_INICIAL", NumberUtils.createLong(folioInicial)); + ps.setLong("FOLIO_FINAL", NumberUtils.createLong(folioFinal)); } else { ps.setString("CVEESTADO", cveestado); } diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java index 6eb72ab33..b2bd8798d 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java @@ -12,19 +12,15 @@ import org.hibernate.criterion.Projections; import org.hibernate.criterion.Restrictions; import org.springframework.orm.hibernate3.support.HibernateDaoSupport; -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ import com.rjconsultores.ventaboletos.dao.GenericDAO; /** * * @author gleimar */ +@SuppressWarnings("unchecked") public class GenericHibernateDAO extends HibernateDaoSupport implements GenericDAO { - @SuppressWarnings("unchecked") public GenericHibernateDAO() { this.persistentClass = (Class) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0]; } @@ -45,7 +41,6 @@ public class GenericHibernateDAO extends HibernateDa } } - @SuppressWarnings("unchecked") @Override public T obtenerID(ID id) { try { diff --git a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java index 2acd79266..94cbcc912 100644 --- a/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java +++ b/src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java @@ -80,12 +80,13 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO