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

bug#15923 

dev: 
qua:

git-svn-id: http://desenvolvimento.rjconsultores.com.br/repositorio/sco/AdmVenta/Model/trunk/modelWeb@97664 d1611594-4594-4d17-8e1d-87c2c4800839
master
fabio 2019-09-17 19:34:49 +00:00
parent 6f881c9af8
commit 32cf62b520
8 changed files with 233 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

216
pom.xml 100644
View File

@ -0,0 +1,216 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.rjconsultores</groupId>
<artifactId>modelWeb</artifactId>
<version>0.0.1-SNAPSHOT</version>
<build>
<sourceDirectory>src</sourceDirectory>
<resources>
<resource>
<directory>src</directory>
<excludes>
<exclude>**/*.java</exclude>
</excludes>
</resource>
</resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>2.7.6</version>
</dependency>
<dependency>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
<version>2.2.2</version>
</dependency>
<dependency>
<groupId>axis</groupId>
<artifactId>axis</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>brazilutils</artifactId>
<version>0.1.1</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
<version>1.4.4</version>
</dependency>
<dependency>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxrs</artifactId>
<version>2.2.1.GA</version>
</dependency>
<dependency>
<groupId>commons-dbutils</groupId>
<artifactId>commons-dbutils</artifactId>
<version>1.6</version>
</dependency>
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
<version>1.0.1</version>
</dependency>
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>net.sf.jasperreports</groupId>
<artifactId>jasperreports</artifactId>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-orm</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.zkoss.zk</groupId>
<artifactId>zul</artifactId>
<version>5.0.9</version>
</dependency>
<dependency>
<groupId>org.zkoss.zk</groupId>
<artifactId>zkplus</artifactId>
<version>5.0.9</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20140107</version>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
<version>3.0.0.GA</version>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>ejb3-persistence</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.6.6.Final</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>3.8</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>3.8</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>GeneradorBoletosCNAB</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>WSAG</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>br.com.rjconsultores</groupId>
<artifactId>WSTotvs</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

3
src/com/rjconsultores/ventaboletos/auditoria/interceptor/AuditInterceptor.java
View File

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

4
src/com/rjconsultores/ventaboletos/dao/hibernate/CajaHibernateDAO.java
View File

@ -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<Object, Long> implements CajaDAO {
private static Logger log = org.slf4j.LoggerFactory.getLogger(CajaHibernateDAO.class);
@ -189,7 +190,6 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
sql.setResultTransformer(new AliasToBeanResultTransformer(CajaDetalleVO.class));
@SuppressWarnings("unchecked")
List<CajaDetalleVO> lsBusca = sql.list();
List<CajaDetalleVO> lsResultado = new ArrayList<CajaDetalleVO>();
@ -564,7 +564,6 @@ public class CajaHibernateDAO extends GenericHibernateDAO<Object, Long> implemen
return new BigDecimal(chave += seq);
}
@SuppressWarnings("unchecked")
private List<DadosBancarioVO> 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<Object, Long> implemen
return TipoFormapago.DEPOSITO.equals(tipoFormapago);
}
@SuppressWarnings("unchecked")
@Override
public Map<String, List<Caja>> buscarCajaYTarjeta(String... numoperacionList) {

4
src/com/rjconsultores/ventaboletos/dao/hibernate/FiscalHibernateDAO.java
View File

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

7
src/com/rjconsultores/ventaboletos/dao/hibernate/GenericHibernateDAO.java
View File

@ -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<T, ID extends Serializable> extends HibernateDaoSupport implements GenericDAO<T, ID> {
@SuppressWarnings("unchecked")
public GenericHibernateDAO() {
this.persistentClass = (Class<T>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
}
@ -45,7 +41,6 @@ public class GenericHibernateDAO<T, ID extends Serializable> extends HibernateDa
}
}
@SuppressWarnings("unchecked")
@Override
public T obtenerID(ID id) {
try {

13
src/com/rjconsultores/ventaboletos/dao/hibernate/RutaCombinacionHibernateDAO.java
View File

@ -80,12 +80,13 @@ public class RutaCombinacionHibernateDAO extends GenericHibernateDAO<RutaCombina
public RutaCombinacion busquedaTramoRutaTramo(Ruta ruta, Tramo trBuscaOrigemDestino) {
String hql = " select rc from RutaCombinacion rc, Tramo t "
+ " where rc.tramo.tramoId = t.tramoId and rc.activo = 0 "
+ " and rc.ruta.rutaId = " + ruta.getRutaId()
+ " and t.origem.paradaId = " + trBuscaOrigemDestino.getOrigem().getParadaId()
+ " and t.destino.paradaId = " + trBuscaOrigemDestino.getDestino().getParadaId();
Query sq = getSession().createQuery(hql);
StringBuilder hql = new StringBuilder();
hql.append(" select rc from RutaCombinacion rc, Tramo t ");
hql.append(" where rc.tramo.tramoId = t.tramoId and rc.activo = 0 ");
hql.append(" and rc.ruta.rutaId = ").append(ruta.getRutaId() );
hql.append(" and t.origem.paradaId = ").append(trBuscaOrigemDestino.getOrigem().getParadaId() );
hql.append(" and t.destino.paradaId = ").append(trBuscaOrigemDestino.getDestino().getParadaId() );
Query sq = getSession().createQuery(hql.toString());
RutaCombinacion rc = new RutaCombinacion();
if (sq.list().size() > 0) {

3
src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCCFServiceImpl.java
View File

@ -11,7 +11,6 @@ import java.util.Map.Entry;
import javax.sql.DataSource;
import org.apache.log4j.Logger;
import org.jfree.util.Log;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -104,7 +103,7 @@ public class MonitoramentoCCFServiceImpl implements MonitoramentoCCFService{
}
}
} catch (Exception e) {
Log.error("", e);
log.error("", e);
}
}

6
src/com/rjconsultores/ventaboletos/service/impl/MonitoramentoCRZServiceImpl.java
View File

@ -4,7 +4,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
import org.jfree.util.Log;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -16,6 +16,8 @@ import com.rjconsultores.ventaboletos.utilerias.UsuarioLogado;
@Service("monitoramentoCRZService")
public class MonitoramentoCRZServiceImpl implements MonitoramentoCRZService{
private static Logger log = Logger.getLogger(MonitoramentoCRZServiceImpl.class);
@Autowired
private MonitoramentoCRZDAO monitoramentoCRZDAO;
@ -36,7 +38,7 @@ public class MonitoramentoCRZServiceImpl implements MonitoramentoCRZService{
try{
return monitoramentoCRZDAO.suscribir(entidad);
} catch (Exception e){
Log.error("", e);
log.error("", e);
return entidad;
}
}